IThundxr
e0f7030d46
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
...
# Conflicts:
# build.gradle
# gradle.properties
2025-03-02 13:57:26 -05:00
IThundxr
bc335ddc0d
Opposite day
...
- Strict actually means "Bundle anything between that range, and preferably the newest"
2025-03-02 13:55:32 -05:00
IThundxr
689d6ed4f1
Publish slim jar
2025-03-02 10:59:32 -05:00
IThundxr
dacf3e1628
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
2025-03-02 08:05:00 -05:00
IThundxr
77066b8971
Fix publishing version & re-enable cf publishing
2025-03-02 08:04:33 -05:00
TropheusJ
cda89da9ca
better fix for InventorySorter compat
2025-03-01 19:55:49 -05:00
IThundxr
8539481a85
Completely Fluid
...
- Fix crash with fluid propagator
2025-03-01 15:58:38 -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
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
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
2e40bb296c
Temp disable
2025-02-28 19:25:15 -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
c23db770dc
The wheel stares back
2025-02-28 07:16:11 -05:00
Jozufozu
7e49954aa5
Fledgling wheel
...
- Bump flywheel and ponder versions
- Fix renamed model builder reference
2025-02-27 21:26:46 -08: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
zelophed
8fdb2326d0
maven prep
2025-02-27 17:45:25 +01:00
IThundxr
994f0afd3e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-21 19:14:50 -05:00
IThundxr
89ba8a76bc
CoreModn't
2025-02-21 16:42:07 -05:00
IThundxr
4ebde6610c
Sodium enhanced animated textures
...
- Fix animated textures for saws and factory gauges not being animated when sodium is installed
2025-02-19 21:44:56 -05:00
IThundxr
61e08b13a2
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-28 15:28:51 -05:00
IThundxr
667a252f4e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# build.gradle
# gradle.properties
# src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
# src/generated/resources/data/create/recipe/milling/cactus.json
# src/generated/resources/data/create/tags/block/sugar_cane_variants.json
# src/generated/resources/data/minecraft/tags/block/combination_step_sound_blocks.json
# src/generated/resources/data/minecraft/tags/block/inside_step_sound_blocks.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/api/equipment/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/compat/Mods.java
# src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
# src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
# src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
# src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
# src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
# src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
# src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
# src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
# src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
# src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
# src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
# src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
# src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
# src/main/java/com/simibubi/create/content/processing/burner/BlockBasedTrainConductorInteractionBehaviour.java
# src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
# src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java
# src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
# src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
# src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java
# src/main/java/com/simibubi/create/infrastructure/debugInfo/ServerDebugInfoPacket.java
# src/main/resources/META-INF/mods.toml
2025-01-28 13:21:10 -05:00
Jozufozu
5cc77c6d2a
Making room
...
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
IThundxr
91766abf62
Evening fixes
2025-01-22 17:28:32 -05:00
IThundxr
4ab0209310
Forgotten text
...
- Add maven for neoforgeconfigapiport so gametest server runs properly
2025-01-21 09:18:44 -05:00
IThundxr
1edd6ad2df
Clipping clipboards
...
- Fix crash when closing the clipboard window
- Fix runtime generated recipes
2025-01-20 10:30:34 -05:00
IThundxr
f4be0420e9
Missing records
2025-01-19 21:17:01 -05:00
IThundxr
664a7fa954
Old days
...
- Fix forge bundling an old version of ponder
2025-01-18 21:04:54 -05:00
IThundxr
e261439c63
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-18 13:07:17 -05:00
zelophed
2141e69aa2
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.20.1/merge-catnip
...
# Conflicts:
# build.gradle
# src/main/java/com/simibubi/create/AllPartialModels.java
# src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java
# src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java
# src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java
# src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java
# src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java
# src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java
2025-01-18 15:04:48 +01:00
IThundxr
9edc952d3a
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-17 22:16:44 -05:00
zelophed
3fb6e71ec8
remove references to catnip as a mod
2025-01-17 14:52:52 +01:00
Jozufozu
efedee7d48
Confused diffuse
...
- Fix bottom of chain conveyor guards not matching the bottom of chain
conveyors
- Bump flywheel build, add vanillin at runtime
2025-01-16 12:18:45 -08:00
IThundxr
28ca976cd4
Cat in the box
2025-01-14 14:10:52 -05:00
IThundxr
e86b080017
What a bad mix up
...
- Fix accessors by removing and replacing with method handles/AT's
2025-01-14 11:54:09 -05:00
IThundxr
a70ab4ef63
Refmap Referee
...
- Fix refmap not being remapped
2025-01-12 18:05:58 -05:00
IThundxr
fdc069910c
Mixed up errors
...
- Fix
2025-01-12 17:46:01 -05:00
IThundxr
88907795fe
Elephant taming
...
- Enable parallel and caching args
- Modify tasks to support configuration cache
2025-01-12 16:23:40 -05:00
