IThundxr
20c3f6ca8c
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
2025-03-02 07:51:41 -05:00
IThundxr
45f913d07c
update wrapper validation
2025-03-02 07:51:01 -05:00
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
IThundxr
a89b582ae3
Morning fixes
...
- Fix upload task not uploading the reobf'd jar
- Fix debug info not translating the graphics mode text
- Fix crash with factory gauges
- Mark getQueuedPromises as @Nullable
2025-03-01 07:54:34 -05:00
IThundxr
eccf2de123
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
...
# Conflicts:
# .github/workflows/build.yml
# .github/workflows/release.yml
2025-02-28 19:21:14 -05:00
IThundxr
d292d36200
fix workflow
2025-02-28 19:10:07 -05:00
IThundxr
63dfa04beb
Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev
2025-02-28 19:09:52 -05:00
IThundxr
9785760bbb
fix workflow
2025-02-28 19:09:18 -05:00
IThundxr
34fa528a6c
Workflows
2025-02-28 19:07:43 -05:00
IThundxr
dbb4f9decb
Java 4021
2025-02-28 11:36:20 -05:00
IThundxr
15565fab47
Port to 1.21.1
...
Co-authored-by: TropheusJ <jverrellijr@icloud.com>
Co-authored-by: techno-sam <77073745+techno-sam@users.noreply.github.com>
Co-authored-by: ryanhcode <42245712+ryanhcode@users.noreply.github.com>
2025-01-07 21:00:32 -05:00
