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
simibubi
e5e2708c66
Port new changes
2025-03-02 12:24:29 +01:00
simibubi
d3c8718ba9
Merge branch 'mc1.20.1/dev' into mc1.21.1/dev
2025-03-02 12:01:12 +01:00
simibubi
e0ab2796bd
Patch Production II
...
- Fixed crash when shift-clicking items in the package filter UI #7497
- Fixed crash caused by the create menu button when loaded too early #7521
- Safety check for fan processing type view crashing #7499 (Might be a concurrency issue, maybe investigate this further)
2025-03-02 11:49:58 +01:00
Jozufozu
91b6072f21
Canonical wheel
...
- Bump flywheel version
2025-03-01 22:55:03 -08: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
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
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
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
simibubi
dbc4754ca4
bump neoforge and run data
2025-02-27 16:20:06 +01: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
3bcabaf18e
Steamed Codecs
...
- Rewrite codecs using StreamCodec#composite(codec, getter, factory) to use StreamCodec#map instead
- Require StreamCodec's for ItemAttribute's
2025-02-17 10:56:19 -05:00
simibubi
ee4414f149
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-11 14:58:48 +01:00
Jozufozu
99cf19dd5d
Keep it up
...
- Bump flywheel build to fix vertically oriented drills on contraptions
2025-02-08 17:04:46 -08:00
IThundxr
7c670cd7e1
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# gradle.properties
# src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
# src/generated/resources/.cache/dc4224e5ed0ee367217e022442da0b7476174a87
# src/generated/resources/data/create/advancement/recipes/misc/crafting/kinetics/encased_chain_drive_from_zinc.json
# src/generated/resources/data/create/recipe/crafting/curiosities/item_copying.json
# src/generated/resources/data/create/recipe/crafting/kinetics/encased_chain_drive_from_zinc.json
# src/main/java/com/simibubi/create/api/contraption/storage/item/menu/MountedStorageMenus.java
# src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java
# src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockItem.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java
# src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBlockItem.java
# src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultMountedStorage.java
# src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
# src/main/java/com/simibubi/create/foundation/data/RuntimeDataGenerator.java
# src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
# src/main/java/com/simibubi/create/foundation/events/CommonEvents.java
# src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
2025-02-07 15:59:42 -05:00
simibubi
eb4d78f621
Update gradle.properties
2025-02-07 14:50:49 +01:00
simibubi
57f4120cc5
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-05 22:49:59 +01:00
Jozufozu
9723e78dc9
Bump for lighting
...
- Bump flywheel build to fix contraption lighting when near framed glass
2025-02-03 21:17:08 -08:00
Jozufozu
b7c62fa6cb
Spinning is hard sometimes
...
- Bump flywheel build
- Fix drills not spinning when breaking blocks
- Fix bogey shafts not being correctly rotated
- Use chunk cardinal lighting on contraption models
2025-02-02 12:23:26 -08:00
IThundxr
da3f9e3806
Enchanting it all
2025-01-31 19:18:25 -05:00
simibubi
011231b6ec
Get a load of this
...
- Fixed track graphs not migrating from 1.20 worlds
- Fixed anything using blockfaces not migrating from 1.20 worlds
- Fixed assembled empty depots kicking the player
- Fixed passenger offsets of package entities
- Fixed blueprint entity bb causing a stack overflow
2025-01-30 19:11:41 +01:00
IThundxr
2078a78f84
Requested data
...
- Make AutoRequestData immutable, convert into a record and copy to make changes around the code to account for this
2025-01-30 08:21:29 -05:00
IThundxr
1941b8ac43
Sneaky listeners
...
- Fix visuals being registered to create's registrate and getting ignored
- Fix wildcards with things that use Glob#toRegexPattern
2025-01-29 16:43:02 -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
IThundxr
a7518e0dfe
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.20.1/feature-dev
...
# Conflicts:
# build.gradle
# src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c
# src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/compat/Mods.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/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java
# src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
# src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
# src/main/java/com/simibubi/create/foundation/mixin/SmithingMenuMixin.java
# src/main/java/com/simibubi/create/foundation/utility/BlockHelper.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
# src/main/resources/create.mixins.json
2025-01-28 11:35:06 -05:00
IThundxr
d5d171a512
Legacy properties
2025-01-27 12:31:06 -05:00
IThundxr
e6a9f98a91
Leaky buckets
...
- Fix buckets placing flowing fluids instead of fluid sources
2025-01-27 12:22:17 -05:00
Jozufozu
5cc77c6d2a
Making room
...
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
James Mitchell
28d30f3c62
Update JEI integration and add potion fluids to the ingredient list ( #6934 )
...
* Update JEI integration and add potion fluids to the ingredient list
This also resolves a minor issue where all virtual fluids were considered "flowing".
Fixes https://github.com/mezz/JustEnoughItems/issues/3754
* Fixed JEI potion fluids registered without Bottle tag
---------
Co-authored-by: goshante <admin@drulia.ru>
2025-01-26 18:36:17 -05:00
IThundxr
1f265eb923
There once was a ponder II
2025-01-26 15:39:48 -05:00
IThundxr
6fd17c9b49
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-26 15:39:15 -05:00
IThundxr
f3b5d96e48
There once was a ponder II
2025-01-26 15:25:02 -05:00
IThundxr
5ef80a9bd2
There once was a ponder
2025-01-26 15:16:40 -05:00
IThundxr
12df6e0084
Componentsn't
...
- Adjust to the removal of the Components class
2025-01-26 13:55:40 -05:00
IThundxr
6115472fc0
Perfectly configured
...
- Fix config editing on a server causing disconnects
2025-01-25 17:20:21 -05:00
IThundxr
e3b5732539
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# gradle.properties
# src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
# src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionPacket.java
# src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java
2025-01-25 15:16:54 -05:00
IThundxr
80dcbb4177
Regex globs
...
- Parse Schedule Destination, Fetch Packages package addresses with glob
- Also prevent regex injection in all 3 of the above
2025-01-25 15:07:45 -05:00
IThundxr
b4cf29ec83
Missing files
...
- Fix mechanical piston head and piston extension pole loot tables being missing
- Run datagen
2025-01-24 19:17:55 -05:00
IThundxr
91766abf62
Evening fixes
2025-01-22 17:28:32 -05:00
simibubi
474b254dfe
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-22 12:40:47 +01:00
simibubi
547709c2e0
The last arrow bender
...
- Factory gauges try to default to an arrow direction that doesn't clip into blocks
2025-01-21 17:17:04 +01:00
simibubi
70933fead0
Operation: Save the saves
...
- Reading block positions from nbt is now backwards compatible with 1.20
2025-01-21 14:59:05 +01:00
Jozufozu
153c63f1c8
Package deal
...
- Add package entity visual
- Add packager visual
- Don't render the box model in the visual because it relies on item
transforms
- Bump flywheel build
- Upgrade to some of the newer Affine functions where applicable
2025-01-20 12:40:31 -06:00
IThundxr
e4b1f80ff3
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# build.gradle
# gradle.properties
2025-01-19 19:20:58 -05:00
IThundxr
312ae4f674
Lost packets
...
- Fix packets not being registered on the server
2025-01-18 23:29:37 -05:00
IThundxr
528bf0aaeb
The cat is out of the box
2025-01-18 20:56:03 -05:00
IThundxr
c845431cad
Regressions
...
- Fix regressions from the catnip & ponder merge
2025-01-18 16:30:51 -05:00
