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
IThundxr
e261439c63
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-18 13:07:17 -05:00
zelophed
071c3969f5
merge mc1.20.1/feature-dev & bump ponder version
2025-01-18 15:21:02 +01: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
9be39b7f3b
Moving On II
2025-01-16 12:28:44 -05:00
IThundxr
3f3f5a3c24
Eclipsed moon again
...
- Disable config cache, doesn't support eclipse yet
2025-01-12 16:44:32 -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
IThundxr
a962ade027
A new era
...
- Switch to MDG instead of using FG
- Implement CI-based mod publishing
- Embed commit hash into the built jar
- Log commit hash
2025-01-12 16:06:44 -05:00
IThundxr
7e0d504897
A forgotten language
...
- Fix lang keys for keybinds
2025-01-12 12:18:09 -05:00
IThundxr
e91a85c19b
Evening Debug Session
...
- Fix tunnels causing a stack overflow
- Fix crushing wheel gametest
- Fix frog seat position
- Update track placement codec
2025-01-10 21:46:47 -05:00
IThundxr
2ed67bf116
Optional but important decisions
...
- Update catnip
- Fix compile errors caused by updating catnip
- Fix a few crashes
2025-01-09 21:29:50 -05:00
IThundxr
6c35eb18cb
Bugs in the tests
...
- Fix bugs in gametests
- Fix misc crashes
- Fix screens having title screen blur
- Fix gametest export command
2025-01-09 19:45:25 -05:00
IThundxr
a87689b9e4
The elephant stares back
...
Add some flags to hopefully speed up building/syncing
2025-01-09 17:52:57 -05:00
IThundxr
43f33c4345
The packets and the bees
...
- Fix some packets
- Remove unused import in multiple packets
- Fix improper data reading
2025-01-09 17:52:56 -05:00
IThundxr
46c0b090fb
Cat++
...
- Update catnip to fix SbbBuilder
2025-01-08 19:17:15 -05:00
