zelophed c36346b97d Merge branch 'mc1.16/config-ui' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java # src/main/java/com/simibubi/create/foundation/command/AllCommands.java # src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java # src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java # src/main/java/com/simibubi/create/foundation/command/PonderCommand.java # src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java # src/main/java/com/simibubi/create/foundation/command/ToggleExperimentalRenderingCommand.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java # src/main/java/com/simibubi/create/foundation/gui/AllIcons.java # src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java # src/main/java/com/simibubi/create/foundation/ponder/NavigatableSimiScreen.java # src/main/java/com/simibubi/create/foundation/ponder/PonderProgressBar.java # src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java # src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java # src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java # src/main/java/com/simibubi/create/foundation/ponder/ui/ChapterLabel.java # src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java # src/main/resources/create.mixins.json		2021-05-03 16:54:32 +02:00
..
ui	more changes to color and theme	2021-05-03 16:14:58 +02:00
AllConfigs.java	Config shenanigans & Terraforged support	2020-06-05 13:02:11 +02:00
CClient.java	Housekeeping	2021-04-08 19:22:11 +02:00
CCommon.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
CCuriosities.java	Housekeeping	2021-04-08 19:22:11 +02:00
CFluids.java	Brackets and spilled potions	2020-11-04 19:08:01 +01:00
CKinetics.java	Housekeeping	2021-04-08 19:22:11 +02:00
CLogistics.java	Housekeeping	2021-04-08 19:22:11 +02:00
ConfigBase.java	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
CRecipes.java	Bad impression	2021-04-11 15:24:58 +02:00
CSchematics.java	Housekeeping	2021-04-08 19:22:11 +02:00
CServer.java	Issues with Nested Config groups	2020-10-07 11:46:55 +02:00
CStress.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
CWorldGen.java	Get things running, fix forge/mc dependencies and extendo grip	2020-10-03 17:12:32 -04:00
StressConfigDefaults.java	Housekeeping	2021-04-08 19:22:11 +02:00