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
..
contraptions	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
curiosities	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
logistics	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
palettes	Add Create stone to base_stone_overworld block tag (terraforged was complaining)	2021-03-26 23:21:44 +01:00
schematics	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
AllSections.java	Housekeeping	2021-04-08 19:22:11 +02:00
CreateItemGroup.java