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
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
simibubi
c7a3464151
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-02 22:27:37 +02:00
zelophed
2b00602446
append, not add
2021-04-02 22:14:40 +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
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
240510e3ee
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-31 21:18:43 +02:00
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
simibubi
8a4eaef015
Fix tooltip whitespace
2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-30 18:49:13 +02:00
simibubi
ae340ccac0
Spooky ghost honey
...
- Fixed pipes drawing non-source honey from beehives
- Fixed deployers duplicating glass bottles
2021-03-30 18:48:57 +02:00
simibubi
dba1ff9c34
Port new Changes
2021-03-30 18:34:55 +02:00
simibubi
37c3625d4a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-30 18:34:40 +02:00
simibubi
3a6714fb08
Handy Tweaks
...
- Deployers now place block drops into their internal inventory
- Deployers can now harvest honey or honeycombs from beehives
- Pipes can now connect to and drain liquid honey from beehives
2021-03-30 18:10:24 +02:00
simibubi
389b2e0e90
Ponder fix-ups
...
- Input window elements no longer use integer coordinates
- Comfy reading is now a config option and persists across ponder UIs
- Disabled editor mode
2021-03-30 16:57:21 +02:00
simibubi
c2f3ebbf72
Fix Tooltips on 1.16
2021-03-30 16:32:19 +02:00
JozsefA
ff4a9e5c78
Fix arms glitching out on contraptions.
...
- Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.
2021-03-29 15:06:09 -07:00
358ff25031
Fix 1.16 too, i guess
2021-03-29 23:25:28 +02:00
zelophed
0b6098817e
fix some wrench rotation issues
2021-03-29 20:31:08 +02:00
dadde271e4
Fix even more critical crashes, now on schematics
2021-03-29 18:19:17 +02:00
69f4c9f8ad
Fix WrappedWorld.getLightingProvider being null and crashing
2021-03-29 17:19:18 +02:00
90b9a3aff9
Merge & Port
2021-03-29 10:57:50 +02:00
simibubi
5299204fb5
Better Tooltip Integration
...
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
simibubi
bf2a506bb8
A final thought
...
- Fixed non-splitting modes on brass tunnels
- Ponder scenes for ejectors and tunnels
2021-03-28 18:57:50 +02:00
caa3c57b71
Merge & Port
2021-03-28 10:58:25 +02:00
