object-Object a02723d4bf Merge branch 'docgen-2-but-older' into docgen-2-1.20 ... # Conflicts: # Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/categories/greatwork.json # doc/collate_data.py # doc/template.html		2023-08-03 23:14:35 -04:00
..
libs	started updating things to 1.20, halted by patchouli (and presumably others) not being done for 1.20 yet	2023-06-15 15:34:35 +10:00
logs	close #280 and reduce conformity	2022-11-20 21:07:33 -06:00
src	Merge branch 'docgen-2-but-older' into docgen-2-1.20	2023-08-03 23:14:35 -04:00
build.gradle	fix patchouli stuff now that snapshot is available	2023-06-23 15:43:04 +10:00