simibubi
fd65acd91d
Merge pull request #1062 from Snownee/mc1.15/dev
...
Bug fixes
2021-02-19 14:22:37 +01:00
grimmauld
d9aa912796
generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger)
2021-02-19 09:09:29 +01:00
Kryppers
e2ccb80870
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-02-18 22:57:32 +00:00
Kryppers
3c48ece021
It's the Funnel Countdown
...
d-do-do dooo, do-de-do-do-doooo
2021-02-18 22:57:25 +00:00
JozsefA
84c9569707
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering
2021-02-18 14:10:43 -08:00
JozsefA
3e63afa5f5
fix concurrent modification
2021-02-18 14:00:17 -08:00
grimmauld
7023148e7f
generic infinite fluid triggers
2021-02-18 23:00:17 +01:00
grimmauld
8c8a9abd8a
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
simibubi
d59fea1079
Bloat.
...
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01:00
simibubi
c0b6a55209
Merge pull request #1075 from CKenJa/mc1.15/dev
...
Localize Fixes
2021-02-18 18:08:19 +01:00
simibubi
616bc09267
Merge pull request #1040 from Chexet48/patch-2
...
Update it_it.json
2021-02-18 18:07:11 +01:00
simibubi
cf34b2e96b
Fix fast fluid valves
...
- Ensure animated indicators on fluid valves still show up with experimental rendering
2021-02-18 18:05:39 +01:00
simibubi
3ff3992f97
Merge pull request #1118 from Jozufozu/mc1.15/experimental-rendering
...
Experimental Rendering
2021-02-18 17:59:52 +01:00
Kryppers
779b19b377
Multiple Thread improvements.
...
improved the threads.
2021-02-18 16:01:05 +00:00
JozsefA
9b4d53d452
fix one residual merge conflict.
...
creating matrix stacks is expensive, but correct.
2021-02-17 14:27:49 -08:00
JozsefA
24ab4e181f
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering
...
# Conflicts:
# src/main/java/com/simibubi/create/CreateClient.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/resources/META-INF/accesstransformer.cfg
2021-02-17 14:06:13 -08:00
JozsefA
02db3f5a2c
fix some problematic code.
...
creating matrix stacks is expensive, apparently
2021-02-17 13:58:24 -08:00
JozsefA
a5d6262424
fix mechanical crafter cogs
2021-02-17 11:24:40 -08:00
Zelophed
159e298e8b
paletted contraptions
...
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
2021-02-17 17:21:31 +01:00
JozsefA
7aa175dd9c
fix gantry cogs skipping every half rotation
2021-02-16 15:13:48 -08:00
JozsefA
d2e30eeab5
finish merge
...
remove old assets
2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d
Assisted Placement, Part IV-b
2021-02-16 22:50:11 +01:00
grimmauld
c6f82bff5e
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-16 20:29:40 +01:00
JozsefA
15302495f5
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
...
# Conflicts:
# src/main/java/com/simibubi/create/AllEntityTypes.java
# src/main/java/com/simibubi/create/AllSpriteShifts.java
# src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
# src/main/java/com/simibubi/create/foundation/command/AllCommands.java
# src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1
Assisted Placement, Part IV
...
- added 👻 -blocks as a placement preview
2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b
avoid floating point accuracy errors at high coordinate values.
...
refactor contraption model translation to be a method in AbstractContraptionEntity.
- this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9
Add max stack size check to ItemHelper.extract
2021-02-14 11:51:31 +08:00
Snownee
676a05ad07
Fix rose quartz duplication glitch ( #1104 )
2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16
avoid 'glGet's at all costs
2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769
contraption actors take into account self lighting
2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7
cache KTEs' renderBoundingBox
2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f
Avoid unnecessary piston contraption assembling
2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4
probably fix issue with phosphor crashing contraptions
2021-02-12 21:11:35 -08:00
Snownee
dae651c046
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262
whoops null pointer is no more
2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95
hotswapping is more sane now.
2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1
kinda separate system capability stuff, should probably clean this up more.
...
fix lighting glitches on world load.
2021-02-12 16:36:20 -08:00
JozsefA
d824304f12
tile entities on contraptions account for self lighting
2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472
these are somewhere else too
2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce
everything is somewhere else
2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff
better vertex attributes.
...
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319
Player Feedback, Part III
2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6
some attrib stuff
2021-02-11 14:31:50 -08:00
Zelophed
82e922032a
Merge branch 'mc1.15/feedback2' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8
Player Feedback, Part II
2021-02-11 17:47:55 +01:00
JozsefA
3820e11954
get it working again
2021-02-11 02:26:30 -08:00
JozsefA
02114b1d9a
begin 2.0 compatibility push, probably not going to be ready for the next release
2021-02-10 17:14:03 -08:00
Zelophed
f3fd32edd3
Assisted Placement, Part III
...
- blocks placed by helpers make sounds again
- helpers now trigger the proper event and can be cancelled
2021-02-11 00:28:47 +01:00
JozsefA
e93562569b
world fog works, fluid fog still doesn't.
...
better dimension changes.
2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90
Localize Fixes
2021-02-10 13:07:41 +09:00
