Jozufozu 2254a693c9 Merge branch '1.18/dev' into 1.18/shader-sanity ... # Conflicts: # src/main/java/com/jozufozu/flywheel/backend/source/FileResolution.java # src/main/java/com/jozufozu/flywheel/core/shader/GameStateProgram.java # src/main/java/com/jozufozu/flywheel/core/shader/gamestate/NormalDebugStateProvider.java # src/main/java/com/jozufozu/flywheel/core/shader/spec/BooleanGameStateCondition.java # src/main/java/com/jozufozu/flywheel/core/shader/spec/GameStateCondition.java # src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramState.java # src/main/java/com/jozufozu/flywheel/core/shader/spec/SpecificValueCondition.java		2022-01-07 11:52:42 -08:00
..
com/jozufozu/flywheel	Merge branch '1.18/dev' into 1.18/shader-sanity	2022-01-07 11:52:42 -08:00