Commit graph

4441 commits

Author SHA1 Message Date
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
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
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
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
simibubi
37d29aeecf Playtest bugs
- Fixed passenger y offset when seated on contraptions
- Fixed general y offset on minecart contraption collision and rendering
- Fixed nameplates on frogport and postbox
- Fixed mechanical crafting recipes applied upside down
- Fixed repackager modifying recipe data of packages
- Fixed repackager not registering its item handler
- Fixed mechanical crafters initialising item handlers too early
- Fixed maximised track placement not working
2025-01-24 13:20:56 +01:00
IThundxr
16f4c3354d
Missing return address
- Fix opening the jei recipe window causing the stock keeper to lose it's previouslyUsedAddress
2025-01-23 21:48:04 -05:00
IThundxr
2449e24ef3
Crafter hypnosis
- Correctly invalidate invCap for mechanical crafter's upon connectivity change
2025-01-23 20:43:07 -05:00
IThundxr
deb8af25a4
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-23 17:49:35 -05:00
IThundxr
fa32a1459f
Blazing stock keepers
- Fix direction needed to create a blaze stock keeper
2025-01-23 17:40:10 -05:00
IThundxr
d79ac2a41b
Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev 2025-01-23 17:31:20 -05:00
IThundxr
4dd9387d13
Optional, but required fixes 2025-01-23 17:31:07 -05:00
simibubi
64f4a8a8a1 Fixed crash when rendering blaze burner in UI 2025-01-23 17:04:38 +01:00
simibubi
ab4f306708 Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-23 16:47:24 +01:00
simibubi
f5445fc406 Fixed missing stock keeper in UI 2025-01-23 16:46:18 +01:00
simibubi
1ba4f21c9d Virtually invisible
- Use ponder-safe version of IsBackendOn()
- Minor ux improvements to address edit box
2025-01-23 15:46:10 +01:00
simibubi
22078c6c8a Re-export some ponder scenes 2025-01-23 14:40:42 +01:00
simibubi
856425a818 To good to go
- Fixed minecart couplings and dual cart contraptions
2025-01-23 13:51:39 +01:00
IThundxr
fc69ef2982
Held recipes 2025-01-22 21:48:42 -05:00
IThundxr
eed9447e5d
Capturing blazes 2025-01-22 21:45:47 -05:00
IThundxr
91766abf62
Evening fixes 2025-01-22 17:28:32 -05:00
IThundxr
1cad65d2d0
An odd looking wrench II 2025-01-22 16:44:05 -05:00
simibubi
b393e9b1fd Update PackageVisual.java 2025-01-22 12:45:07 +01: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
9ab45928eb Playtest bugs
- Display links on 'combine item names' now read a packages' address rather than their name
- Fixed goggles in curio slot not rotating correctly when riding chain conveyors
- Fixed incorrect yaw of package visuals
- Fixed entity name display source not working for players on signs
- Fixed price tag not working when table cloth is not on a full block
- Redstone Requesters no longer have wooden material properties
2025-01-22 12:27:35 +01:00
IThundxr
77c8dfa6d2
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-21 14:25:18 -05:00
IThundxr
24cba3caf9
A terrible view 2025-01-21 14:25:12 -05:00
IThundxr
77682a344b
Disaster prevention
- Switch PackagePortTarget.Type into a proper registry, avoiding someone injecting enums in an unsafe way
2025-01-21 14:23:23 -05:00
simibubi
5e3a4ed862 Turn it up
- Boost some of the new sounds
- Metal table cloths are now called table cover
2025-01-21 17:52:36 +01:00
IThundxr
60076e49c1
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-21 11:37:13 -05:00
IThundxr
71509d5792
An odd looking wrench
- Implemented #create:chain_rideable to mark items as valid for riding a chain with
2025-01-21 11:35:32 -05: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
IThundxr
4ab0209310
Forgotten text
- Add maven for neoforgeconfigapiport so gametest server runs properly
2025-01-21 09:18:44 -05:00
IThundxr
245097cdeb
A breath of fresh air 2025-01-21 09:11:21 -05: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
IThundxr
5e6c0bfaca
Sprinkled fixes
- Re-hookup durability for armour
- Filter ClipboardEditPacket data again
- Fix OrientedContraptionEntity offset applying to all contraptions
2025-01-20 21:58:59 -05:00
IThundxr
a0b6078f1b
Packed Panels 2025-01-20 17:37:52 -05:00
IThundxr
7f99223b9b
Weak links 2025-01-20 17:12:57 -05:00
IThundxr
87cfd343d7
Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev 2025-01-20 16:40:39 -05:00
IThundxr
9e8fa2757c
Gone without a trace
- Fix Copper Grates not being marked as fan transparent
- Fix cart contraption render offset
- Fix processing output having a components field
- Fix crash when placing factory panels
- Fix crash when using the stock ticker
2025-01-20 16:40:22 -05:00
simibubi
d239325dc6 Generics and Eclipse 2025-01-20 22:39:53 +01:00
IThundxr
1b64d01010
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-20 15:52:04 -05:00
IThundxr
ddb56e3815
NBA Superstar
- Fix throwing packages in creative taking away the package
2025-01-20 15:50:20 -05: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
simibubi
f98a8f7efb Ambient confusion
- Stock link antennas no longer shade
- Chain conveyor casing is now rendered through flywheel
- Tweaks to copper roof connectivity
- Requesters now use the wifi particle when successful
2025-01-20 18:05:52 +01:00