Commit Graph

792 Commits

Author SHA1 Message Date
75fa508b0e Merge pull request 'fixed hero mdbook parsing' (#146) from development_update3 into development
Reviewed-on: #146
2024-09-23 14:42:37 +00:00
mik-tf
93ceb68398 fixed hero mdbook parsing 2024-09-23 10:41:47 -04:00
1461fc8d33 Merge pull request 'fixed hero mdbook parsing' (#145) from development_update2 into development
Reviewed-on: #145
2024-09-23 14:38:52 +00:00
mik-tf
32d064c080 fixed hero mdbook parsing 2024-09-23 10:37:44 -04:00
2f3e9e02c5 Merge pull request 'fixed typos' (#144) from development_update_manual into development
Reviewed-on: #144
2024-09-23 14:31:54 +00:00
mik-tf
b235306252 fixed typos 2024-09-23 10:29:54 -04:00
e2368b20cd ... 2024-09-23 17:25:02 +03:00
489a7eeee9 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-09-23 17:02:13 +03:00
8c691b5488 ... 2024-09-23 17:02:10 +03:00
3f7ddc572a Delete heroscript/tech/sshkey.md 2024-09-23 10:57:33 +00:00
c91950cde5 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
* 'development' of git.ourworld.tf:tfgrid/info_tfgrid:
  ...
  ...
  export for mdbook
  s
  s
  fixed
  finalized info_fgrid sync
  updated sync with info_grid
  troubleshootinfg farming
  update
  updated faq, tft
  updated 0133
  updated 0133
  Update collections/projectinca/stories/stories.md
  collection update
2024-09-19 06:32:55 +04:00
ace7e68069 ... 2024-09-19 06:32:47 +04:00
cc81c96b38 ... 2024-09-19 06:06:43 +04:00
cb2fbb26bf ... 2024-09-18 07:40:11 +03:00
244d0a4aa4 export for mdbook 2024-09-09 10:04:34 +02:00
d84487b79d s 2024-09-09 07:19:25 +02:00
a961c63f16 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-09-01 06:10:24 +02:00
6a35f7eb85 s 2024-09-01 06:10:23 +02:00
1540effde3 Merge pull request 'fixed' (#142) from development_fix_quick into development
Reviewed-on: #142
2024-08-29 23:29:11 +00:00
mik-tf
ea27326ae4 fixed 2024-08-29 19:28:46 -04:00
e16b01f7d4 Merge pull request 'finalized info_fgrid sync' (#141) from development_final_sync into development
Reviewed-on: #141
2024-08-29 23:23:44 +00:00
mik-tf
0c33119601 finalized info_fgrid sync 2024-08-29 19:22:26 -04:00
a75e59d42c Merge pull request 'updated sync with info_grid' (#140) from development_update_new into development
Reviewed-on: #140
2024-08-29 22:15:43 +00:00
mik-tf
4b44fa1664 updated sync with info_grid 2024-08-29 18:15:05 -04:00
ca9288af82 Merge pull request 'troubleshootinfg farming' (#139) from development_trouble into development
Reviewed-on: #139
2024-08-29 21:24:42 +00:00
mik-tf
350531c668 troubleshootinfg farming 2024-08-29 17:23:40 -04:00
544dacad02 Merge pull request 'development_update' (#138) from development_update into development
Reviewed-on: #138
2024-08-29 20:46:21 +00:00
mik-tf
7567164929 update 2024-08-29 16:45:52 -04:00
mik-tf
b7e3f2b323 updated faq, tft 2024-08-29 16:43:43 -04:00
ec47399867 Merge pull request 'development_update_from_0133' (#137) from development_update_from_0133 into development
Reviewed-on: #137
2024-08-29 20:14:58 +00:00
mik-tf
516c036a46 updated 0133 2024-08-29 16:14:09 -04:00
mik-tf
811493e9b0 updated 0133 2024-08-29 16:10:38 -04:00
372ba64e4e Update collections/projectinca/stories/stories.md 2024-08-29 20:00:51 +00:00
260fcfeb16 collection update 2024-08-29 19:50:49 +00:00
9b2cda9e8e update 2024-08-26 11:14:18 +02:00
972d0e48a9 Merge pull request 'decentralization update project inca' (#136) from development_dec2 into development
Reviewed-on: #136
2024-08-20 15:49:55 +00:00
Mik-TF
2fe3773aac decentralization update project inca 2024-08-20 11:49:01 -04:00
79bec3ec39 Merge pull request 'decentralization update project inca' (#135) from development_dec into development
Reviewed-on: #135
2024-08-20 15:45:40 +00:00
Mik-TF
a8be8ff612 decentralization update project inca 2024-08-20 11:45:03 -04:00
b7f845a4cf Merge pull request 'updated liquidity' (#134) from development_liquidity into development
Reviewed-on: #134
2024-08-20 14:50:04 +00:00
Mik-TF
ffbe65714a updated liquidity 2024-08-20 10:49:25 -04:00
1f743cd15f Merge pull request 'updated intro and tokenomics for projectinca' (#133) from development_new into development
Reviewed-on: #133
2024-08-19 22:11:30 +00:00
Mik-TF
5de7e3180d updated intro and tokenomics for projectinca 2024-08-19 18:06:22 -04:00
b5d155d00b Merge pull request 'updated intro first part of project inca' (#132) from development_update_intro into development
Reviewed-on: #132
2024-08-19 20:31:15 +00:00
Mik-TF
2c1e878d9c updated intro first part of project inca 2024-08-19 16:29:07 -04:00
17efd5f8e1 Merge pull request 'added info for first page projectinca' (#131) from development_update2 into development
Reviewed-on: #131
2024-08-19 19:38:39 +00:00
Mik-TF
ec07a2d4d3 Merge branch 'development' into development_update2
merge dev
2024-08-19 15:37:21 -04:00
3c0082a005 ... 2024-08-17 13:22:25 +02:00
Mik-TF
416d03381e added info for first page projectinca 2024-08-16 12:18:43 -04:00
d93f748bfb s 2024-08-16 14:04:37 +02:00