IThundxr 5734f4b119 Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev ... # Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # build.gradle # gradle.properties # src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java # src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java # src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java # src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java # src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java # src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java # src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java # src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java # src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java # src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java # src/main/resources/META-INF/mods.toml		2025-03-01 15:53:53 -05:00
..
config	A new era	2025-01-12 16:06:44 -05:00
ISSUE_TEMPLATE	A new era	2025-01-12 16:06:44 -05:00
workflows	Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev	2025-03-01 15:53:53 -05:00