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
93f268419b
Fix heavy boots
2025-03-01 15:22:07 -05:00
IThundxr
c5d9e06779
Slim jars III
2025-03-01 14:45:30 -05:00
IThundxr
bb39ed0fba
Slim jars II
2025-03-01 14:34:55 -05:00
IThundxr
b3cf357dbb
Slim jars
2025-03-01 14:06:37 -05:00
IThundxr
4dcdc6c373
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/dev
...
# Conflicts:
# gradle.properties
2025-03-01 14:02:25 -05:00
IThundxr
da87ecb952
Chaotic day
...
- Publish slim jars
- Allow cardboard swords to damage other arthropods
- Update flywheel
- Fix players getting forced into swim mode when using diving boots
- Fix crash with re-packagers and stock links
- Optional dep updates
2025-03-01 14:01:18 -05:00
IThundxr
4ec1bd1114
The bugs escaped the box II
...
- Run datagen
2025-03-01 09:08:06 -05:00
IThundxr
427105d4fc
The bugs escaped the box
...
- Fix item group attribute crashing
- Fix mixin conflict with imm portals
- Fix processing output not supporting components
- Run datagen
2025-03-01 09:00:10 -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
8e002e49fa
fix artifact name
2025-02-28 21:35:49 -05:00
IThundxr
6019e17a8b
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
2025-02-28 21:27:51 -05:00
IThundxr
e431324f98
Fix publishing to maven
2025-02-28 21:27:18 -05:00
IThundxr
c0a1e022ee
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
2025-02-28 19:35:51 -05:00
IThundxr
6f6072dbd0
undo jenkins changes
2025-02-28 19:35:36 -05:00
IThundxr
cb17d887bb
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
...
# Conflicts:
# build.gradle
2025-02-28 19:26:10 -05:00
IThundxr
2e40bb296c
Temp disable
2025-02-28 19:25:15 -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
783bc714b2
Update jenkins file
2025-02-28 19:20:17 -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
TropheusJ
50ab1221c3
replace all uses of holder.get() with holder.value()
2025-02-28 17:25:36 -05:00
IThundxr
dbb4f9decb
Java 4021
2025-02-28 11:36:20 -05:00
IThundxr
62bbb107ac
Update displayName
2025-02-28 11:20:13 -05:00
IThundxr
9a41f8991f
Update displayName
2025-02-28 11:19:45 -05:00
IThundxr
004917cafd
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-28 11:17:08 -05:00
IThundxr
e5e14483af
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev
2025-02-28 11:15:52 -05:00
IThundxr
447c8f0a36
Comment out cf publishing
2025-02-28 11:15:01 -05:00
simibubi
c1f98351aa
Build a jar
2025-02-28 17:05:48 +01:00
IThundxr
9f07ac4ca0
Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev
2025-02-28 07:16:19 -05:00
IThundxr
c23db770dc
The wheel stares back
2025-02-28 07:16:11 -05:00
simibubi
decb2e7e3a
Port new changes
2025-02-28 11:51:52 +01:00
simibubi
59985dc1e8
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-28 11:40:05 +01:00
simibubi
5ed96e6d34
Third wheels
...
- Fix bogey wheels rendering twice
2025-02-28 11:12:36 +01:00
simibubi
a8a160c666
Frame perfect
...
- Re-enable AO on fluid pipes to restore smooth lighting on them
- Boost sounds in stock keeper screen
- Tweak item frame transforms of creates components
2025-02-28 10:57:08 +01:00
TropheusJ
b67842105d
move default BlockSpoutingBehaviours out of API
2025-02-28 01:09:07 -05:00
PepperCode1
4cfffe3bde
Use existing model data map when buffering contraption structure
2025-02-27 22:07:09 -08:00
Jozufozu
7e49954aa5
Fledgling wheel
...
- Bump flywheel and ponder versions
- Fix renamed model builder reference
2025-02-27 21:26:46 -08:00
IThundxr
653d17e09c
Held registries
2025-02-27 19:21:52 -05:00
IThundxr
881cda5bb6
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# gradle.properties
2025-02-27 19:06:16 -05:00
IThundxr
8802f23b36
Dependencies++
2025-02-27 18:21:08 -05:00
IThundxr
bcb571a017
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
2025-02-27 14:06:52 -05:00
IThundxr
b29acf823b
Java 2021
2025-02-27 14:03:55 -05:00
TropheusJ
2681a34f22
use IntrinsicHolderTagsProvider
2025-02-27 12:18:59 -05:00
zelophed
40e1a30d83
maven prep
2025-02-27 18:03:05 +01:00
zelophed
4be32acee9
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-27 18:01:52 +01:00
simibubi
862708f54b
Update PackagerBlockEntity.java
2025-02-27 18:00:33 +01:00
zelophed
8fdb2326d0
maven prep
2025-02-27 17:45:25 +01:00
