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
84aed3b3f3
API-ification
...
- Move overlay interfaces into the api package
2025-01-27 21:12:42 -05:00
IThundxr
02c75faada
Arts and crafts III
2025-01-27 15:56:10 -05:00
IThundxr
265dc75125
The instances and the visuals
...
- Complete the move to partials
- Fix compile errors from updating flywheel
2025-01-27 13:29:56 -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
Cody
2cf08a1231
Fix deploying food missing particles and not returning the correct items ( #7288 )
...
* fix particle when deploying last food in stack
* Bowl foods deployer fix
2025-01-27 10:25:06 -05:00
Jozufozu
5cc77c6d2a
Making room
...
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
justliliandev
e2b65fd53c
Add api to add custom conductors to trains ( #7030 )
2025-01-26 18:46:33 -05:00
MoePus
4ba5e984a9
Fix rare spout crash and offset rendering ( #7025 )
2025-01-26 18:44:40 -05: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
266e950d8e
Feet off the table.
...
- Fix table cloth sounds
2025-01-26 16:36:49 -05:00
IThundxr
c0c1c1b622
Noisy weapons
...
- Fix cardboard sword not playing sounds when a player is hit by a mob wielding a cardboard sword
2025-01-26 16:28:13 -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
45fae1c58a
Supplier-less II
2025-01-26 12:21:58 -05:00
IThundxr
e2a896bf7e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/AddedByAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/BookAuthorAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/BookCopyAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/FluidContentsAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InItemGroupAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ItemNameAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/legacydeserializers/AllItemAttributeLegacyDeserializers.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/legacydeserializers/StandardTraitsLegacyDeserializer.java
2025-01-26 12:11:02 -05:00
IThundxr
670d8f08d6
Supplier-less
...
- Remove suppliers in AllItemAttributeTypes
2025-01-26 12:07:14 -05:00
IThundxr
c046d59eb9
Change logging
2025-01-26 11:34:30 -05:00
IThundxr
6cfaadde11
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-26 10:18:04 -05:00
simibubi
bca9f0638d
Changelog and new package filter sprite
2025-01-26 13:10:28 +01:00
Kryppers
fe47ebe504
Ancient mixels
...
fixed long standing fault on steam engine texture.
reverted iron sheet texture
adjusted pipe drain geometry to prevent z fighting
2025-01-26 11:47:33 +00:00
simibubi
b43e67fdaa
Out of order
...
- Fixed stock keeper screen not able to request one type item twice in a row
2025-01-26 10:42:43 +01:00
simibubi
f83b8523a6
Merge pull request #3 from Creators-of-Create/jay/mc1.20.1/mounted-storage-refactor
...
Mounted Storage Refactor
2025-01-26 10:15:40 +01:00
IThundxr
3060fee82e
Remembering it all
...
- Fix components not getting copied to the item upon pickup of schematic cannons, toolboxes and backtanks
2025-01-25 22:55:24 -05:00
TropheusJ
7494e646c0
addStorage helpers, catch all deserialization
...
and added depot legacy support
2025-01-25 22:39:51 -05:00
IThundxr
9bd910f0b7
Tested twice II
...
- Fix mechanical crafter gametest
2025-01-25 22:16:49 -05:00
IThundxr
7eb5b2ed9f
Tested twice
...
- Implement gametest for arm multi output
2025-01-25 21:56:03 -05:00
IThundxr
1aedd793ec
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-25 21:10:22 -05:00
IThundxr
6115472fc0
Perfectly configured
...
- Fix config editing on a server causing disconnects
2025-01-25 17:20:21 -05:00
IThundxr
df23084eda
DIY Fixes
...
- Fix Cardboard Armor Trim advancement icon
2025-01-25 15:48:26 -05:00
Jozufozu
484de7cc03
Method actor
...
- DrillsActorVisuals no longer use RotatingInstance
- Instead manually animate by updating rotation in #tick and
interpolating
2025-01-25 14:27:19 -06: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
b073ada21c
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev
2025-01-25 15:07:52 -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
simibubi
18e6d90a37
Bug fixes
...
- Fixed synced storage no longer syncing after world reload
- Fixed trains disappearing on assembly
2025-01-25 17:53:33 +01:00
TropheusJ
80850134ad
run data
2025-01-25 07:57:49 -05:00
TropheusJ
2b91d7cd0c
rework synced storage
...
- ported depot support
2025-01-25 07:04:59 -05:00
simibubi
9a062016b9
Back to back re-pack
...
- Fixed blaze burner not turning into stock keeper at the front of the block
- Fixed blaze burner visual not updating when stock keeping
- Fixed re-packagers not merging redstone requester orders
- Fixed re-packagers not able to export already merged packages
- Re-packagers can now have a sign on them to modify the address
2025-01-25 11:12:16 +01:00
TropheusJ
4c5a350d2b
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into jay/mc1.20.1/mounted-storage-refactor
...
# Conflicts:
# src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c
# src/main/java/com/simibubi/create/content/contraptions/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
# src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
# src/main/java/com/simibubi/create/content/trains/entity/CarriageContraption.java
# src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
# src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
2025-01-25 00:15:08 -05:00
TropheusJ
da89fcab72
sync fluid tank contents
2025-01-25 00:11:28 -05:00
TropheusJ
595263e0df
double it and give it to the next person
...
- fluid mounted storage
- handling for old data format
- a few more docs
2025-01-24 23:07:07 -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
simibubi
7ec928fbf5
Board games
...
- Factory gauges can now be moved using an UI action
- Fixed Wrench, Mechanical Arms and Factory Gauges not able to be assigned to factory gauge slots
- Can no longer use the clipboard with Factory Gauges
2025-01-24 23:44:06 +01:00
IThundxr
3f2bc74fe1
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-24 17:01:46 -05:00
simibubi
922cdfdc16
Playtest bugs
...
- Fixed non-effect fans resetting processed belt items
- Fixed tree cutter considering scaffolding as leaves
2025-01-24 13:38:24 +01:00
