Commit graph

1880 commits

Author SHA1 Message Date
simibubi
b845809b58 The great Escape
- Adresses #1324
2021-04-03 19:50:42 +02:00
simibubi
69c3a57c76 Quell the outrage!
- Placement indicator arrow is slightly smaller by default
2021-04-03 19:46:26 +02:00
simibubi
d1c8ad38fc Chute extraction refactor 2021-04-03 19:41:33 +02:00
simibubi
9ab5c74929
Merge pull request #1340 from sarim/mc1.15/dev
allow smart chute to transfer whole stacks
2021-04-03 19:31:16 +02:00
simibubi
1fd6b4360c Performant fictional entities
- Fixed crash with the Performant mod when entities are present in a ponder scene
2021-04-03 19:30:38 +02:00
simibubi
83e7074f12 Hot Fix-ups
- Change to proper key handling for closing create screens
- Fixed inconsistent collection behaviour of in-world funnels
2021-04-03 18:59:10 +02:00
simibubi
f528520a53 Destructive Pondering
- Fixed a couple overlooked ponder lang issues
- Fixed weighted ejector not accepting arbitrary gold plates in its recipe
- Fix crash opening ponder from screens with an opened recipe book
2021-04-03 18:33:48 +02:00
simibubi
747849d52e Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-04-03 17:55:08 +02:00
simibubi
72789caa01 0/10 not ported
- Fixed text wrapping on ponder text elements
2021-04-03 17:55:06 +02:00
Sarim Khan
463854a2c0
allow smart chute to transfer whole stacks 2021-04-03 21:53:39 +06:00
JozsefA
75f2516408 Hopefully fix ServerWorld class cast exception
- Avoid changing Entity.world, maintain contraption related state in the mixin.
 - Add a mixin to playSound to shift the position of the sound.
2021-04-03 00:42:21 -07:00
zelophed
809bc6bf88 merge and port 2021-04-03 01:16:14 +02:00
zelophed
e05eb5c386 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/config/CClient.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
2021-04-03 01:00:57 +02:00
zelophed
7a6b1c6949 0.3.1 hotfixes, part I 2021-04-03 00:54:28 +02:00
JozsefA
5abc1e0fe7 Instanced pulleys first pass 2021-04-02 13:38:28 -07:00
simibubi
ab147722d5 Update ja_jp.json 2021-04-02 22:27:44 +02:00
simibubi
c7a3464151 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-02 22:27:37 +02:00
zelophed
19862d4341 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-04-02 22:15:11 +02:00
zelophed
2b00602446 append, not add 2021-04-02 22:14:40 +02:00
simibubi
f17a804f43 post-PR datagen 2021-04-02 21:09:40 +02:00
simibubi
7193b5b0c2
Merge pull request #1149 from RakuGaki-MC/mc1.16/dev
[mc1.16/dev] Update ja_jp.json
2021-04-02 21:00:07 +02:00
simibubi
c5f3d4413d
Merge pull request #1322 from Peatral/mc1.15/dev
Update de_de.json
2021-04-02 20:58:29 +02:00
simibubi
b1bec1a1f9 Fix-ups
- Filterless Creative Crates now serve as universal supply to schematic-driven deployers
- An attempt to force-update ejectors to not miss out on lid animations
- Fixed schematic-driven deployers not copying safe nbt data
2021-04-02 19:22:41 +02:00
simibubi
c82896998c
Merge pull request #1216 from mrh0/mc1.15/dev
Improved modding support
2021-04-02 18:56:20 +02:00
Christof
1d31271bcb Update de_de.json
Typos and Gabelstein  = Gabbro
2021-04-02 18:23:11 +02:00
Christof
8dbfd4877e Update de_de.json
Added the translations for a lot of blocks and a few advancements
2021-04-02 18:07:53 +02:00
simibubi
6cfbf26f49 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-01 17:46:07 +02:00
simibubi
6c942be7f5 Too slippery
- Sliding on contraptions now takes its slope into account
- Gantry Carriages are now less prone to break when moved near other blocks
2021-04-01 17:43:39 +02:00
JozsefA
4b00562daf Port to 1.16 2021-03-31 21:44:16 -07:00
JozsefA
4908fc1b96 Change some obfuscated variable names 2021-03-31 21:29:17 -07:00
JozsefA
78fbb52ddc Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
2021-03-31 21:17:01 -07:00
JozsefA
c21a8bcbde Fix startup crash on some AMD drivers.
- The fix comes from Grondag's work on canvas.
 - Original commit: 820bf75409
2021-03-31 20:53:02 -07:00
JozsefA
6ef88c3bd8 Fix some issues with instance rate limiting 2021-03-31 16:25:59 -07:00
JozsefA
b9f6a3b94e Instanced bearings 2021-03-31 16:19:58 -07:00
JozsefA
b743e00978 Better lazy arm instances 2021-03-31 16:18:53 -07:00
grimmauld
240510e3ee Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-31 21:18:43 +02:00
grimmauld
3cc8291b72 Simpler bouncing? Thanks @K1521 2021-03-31 21:18:33 +02:00
Snownee
c02193233b Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-04-01 01:46:52 +08:00
Snownee
ba63cc3e7f Fix tree fertilizer spreading podzol. Backport a440ab6 2021-04-01 01:43:06 +08:00
simibubi
b6857c2a20 Danger Polish
- Fixed Crash when Deployer attempts to use Sand Paper
2021-03-31 15:27:57 +02:00
simibubi
e82f9221b7 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 15:23:18 +02:00
simibubi
5b63f30df3 Abort Mission
- Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed
2021-03-31 15:22:41 +02:00
simibubi
2b4ef88fc1 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 14:50:16 +02:00
simibubi
d61e387916 The least performant option
- Fixed slow merging of collision shapes
- Improved async handling of the collision shape merger
- BBs far away from an entity now get skipped in the collision cycle
2021-03-31 14:27:27 +02:00
JozsefA
65d21c374b Fix crash making step sounds on servers. 2021-03-30 18:50:07 -07:00
simibubi
0bb18db4b6 Oriented bouncing and sliding
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
2021-03-31 03:16:29 +02:00
JozsefA
376c4e1cb0 Fix crash rendering mechanical crafters on contraptions. 2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a Change the locks
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
2021-03-30 14:14:58 -07:00