Commit Graph

424 Commits

Author SHA1 Message Date
Mik-TF
1359609419 set hero book to check new branch 2024-05-10 07:24:11 -04:00
Mik-TF
c67d5d9bee start kristof merge into dev 2024-05-10 07:20:39 -04:00
b932fe9e8b Merge pull request 'main into dev' (#50) from main into development
Reviewed-on: #50
2024-05-10 10:46:12 +00:00
948d6c0de2 Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	books/projectinca/SUMMARY.md
#	collections/tech/primitives/network/mycelium.md
2024-05-09 17:11:35 +03:00
2eed0b65b7 ... 2024-05-09 17:09:00 +03:00
Mik-TF
ba303b6e3e legal update 2024-05-08 20:07:47 -04:00
Mik-TF
b3f8ab18c2 legal update 2024-05-08 20:01:33 -04:00
Mik-TF
2b94ca20ad legal update 2024-05-08 19:58:14 -04:00
Mik-TF
4e41476b12 removed manual legal in legal 2024-05-08 19:57:06 -04:00
Mik-TF
675d67d9fe set manual legal as legal, since work is already done 2024-05-08 19:37:54 -04:00
Mik-TF
1b7b23d38c removed new_mdbook, only useful for testers to buidl with the docs 2024-05-08 19:33:15 -04:00
Mik-TF
f6f0e5a283 updated test final 2024-05-08 19:30:47 -04:00
Mik-TF
fc1d1eff0d updated test with .collection 2024-05-08 19:29:36 -04:00
Mik-TF
ff6b4e0f10 updated test 2024-05-08 19:28:12 -04:00
Mik-TF
8dfcb96d91 updated test 2024-05-08 19:25:15 -04:00
Mik-TF
515d640188 updated test 2024-05-08 19:23:39 -04:00
Mik-TF
cd381257dc updated test summ 2024-05-08 19:18:03 -04:00
Mik-TF
bf28bd296b tech update core capabilities 2024-05-08 16:12:17 -04:00
Mik-TF
4691fc499f tech update zos 2024-05-08 16:08:23 -04:00
Mik-TF
49b357d4e8 tech update architecture 2024-05-08 16:05:24 -04:00
Mik-TF
c29380aabd tech update network wall 2024-05-08 16:03:24 -04:00
Mik-TF
5d8478bcea tech update sumamry 2024-05-08 16:01:25 -04:00
Mik-TF
77f870df7f tech update qsss 2024-05-08 16:00:46 -04:00
Mik-TF
26eec9bfa9 tech update innovations 2024-05-08 15:58:00 -04:00
Mik-TF
b54c5a0eba tech update innovations 2024-05-08 15:56:39 -04:00
Mik-TF
ddf616eef3 tech update innovations 2024-05-08 15:55:04 -04:00
Mik-TF
d46a3af9d0 tech update re-invented 2024-05-08 15:53:41 -04:00
Mik-TF
26432d3009 tech update intro 2024-05-08 15:44:22 -04:00
Mik-TF
a26e9d592b tech update summary 2024-05-08 15:35:41 -04:00
Mik-TF
f8025b3994 updated summaries to introduction not intro 2024-05-08 15:34:00 -04:00
Mik-TF
ea2e27a9c2 tech update title 2024-05-08 15:31:00 -04:00
Mik-TF
74038afb0d tfgrid4 update farming 2024-05-08 15:04:24 -04:00
Mik-TF
9e7d698aee tfgrid4 update home 2024-05-08 14:44:42 -04:00
Mik-TF
d72e6f53ca tfgrid4 update home 2024-05-08 14:43:40 -04:00
Mik-TF
8b72e33f4c tfgrid4 problems update 2024-05-08 14:18:21 -04:00
Mik-TF
b2514cd3be tfgrid4 values update 2024-05-08 14:16:08 -04:00
Mik-TF
abcbef52e7 tfgrid4 tech update 2024-05-08 14:12:55 -04:00
Mik-TF
a5a70cf562 tfgrid4 economy update 2024-05-08 14:11:07 -04:00
Mik-TF
eb0ab69c58 tfgrid4 economy update 2024-05-08 14:10:20 -04:00
Mik-TF
fea38b4e5c tfgrid4 economy update 2024-05-08 14:08:37 -04:00
Mik-TF
6c1c84e997 tfgrid4 added economy as inca_fuel 2024-05-08 14:06:58 -04:00
Mik-TF
3a2c254bce tfgrid4 added back farming for v4 files 2024-05-08 14:02:36 -04:00
Mik-TF
02655c2b21 updated tfgrid4 home 2024-05-08 13:56:52 -04:00
Mik-TF
5b119f1577 updated tfgrid4 home 2024-05-08 13:50:29 -04:00
Mik-TF
dd526eda97 updated tfgrid4 home 2024-05-08 13:48:13 -04:00
Mik-TF
b4992efe45 updated tfgrid4 home 2024-05-08 13:46:40 -04:00
Mik-TF
cf4e012b8e updated tfgrid4 home 2024-05-08 13:22:51 -04:00
Mik-TF
8db00c0242 updated tfgrid4 summary 2024-05-08 13:03:34 -04:00
Mik-TF
bb60ef0c5f tfgrid4 updates 2024-05-08 12:21:08 -04:00
Mik-TF
f2e9e4e9ec tfgrid4 updates 2024-05-08 12:17:46 -04:00