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
..
assets/create	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
data	Merge pull request #1041 from Creators-of-Create/mc1.16/compat-fix-redux	2021-02-06 22:44:03 +01:00
META-INF	Seat-hopping into oblivion	2021-04-16 01:13:46 +02:00
ponder	A final thought	2021-03-28 18:57:50 +02:00
create.mixins.json	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
pack.mcmeta	Port new changes	2021-02-06 22:03:48 +01:00