JozsefA
36e81857a3
Unmeddle the build script, but profiling is good.
2021-02-24 16:57:26 -08:00
JozsefA
c030c08c86
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-02-24 16:53:45 -08:00
JozsefA
e62d89b21c
Everything is lit, hopefully all the time now.
2021-02-24 16:52:49 -08:00
zelophed
753d5d2fa9
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-24 22:06:51 +01:00
zelophed
2f12326203
cloning glue
2021-02-24 22:06:40 +01:00
JozsefA
cad71e5843
Even more compatibility.
2021-02-23 16:20:46 -08:00
JozsefA
f525b7e913
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-02-22 11:27:12 -08:00
JozsefA
bac4be1728
Superglue no longer gums up spawn packets
2021-02-22 11:25:38 -08:00
zelophed
da09112e3c
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-22 03:20:54 +01:00
zelophed
5da1a64622
utility commands
2021-02-22 03:20:09 +01:00
simibubi
fe1c32de05
Cheese control
...
- Windmill bearings now have a configurable minimum of sail blocks
2021-02-21 23:01:57 +01:00
simibubi
e3915792b1
Back to Directional
...
- New vertical funnel models by @Kryppers
2021-02-21 22:29:46 +01:00
zelophed
46daa3f699
composting, but fancy
...
- add the composter as a mechanical arm interaction point
2021-02-21 18:12:19 +01:00
JozsefA
b5f9cbc4b3
improve compatibility layer.
2021-02-20 15:22:07 -08:00
f6b9d71169
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-20 17:58:25 +01:00
6542f2f087
Some cleanup
2021-02-20 17:58:16 +01:00
JozsefA
e84c6d3abe
tweak max origin distance to avoid z-fighting at relatively high coordinates.
...
remove unnecessary state changes.
2021-02-19 15:00:28 -08:00
simibubi
afe2c4497d
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-02-19 16:59:59 +01:00
simibubi
bfd666bb9c
Sequenced Adjustments
...
- Added more descriptive names for sequencer instructions
- 'Await' instruction now requires a rising flank to trigger
- Fixed invalid json of german localization
- Ingored crushing wheel controllers facing in blockstate datagen
2021-02-19 16:55:45 +01:00
a3f2fbe788
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-19 16:39:11 +01:00
5b65a5d78b
better fan stream advancement trigger
2021-02-19 16:39:01 +01:00
simibubi
2ece21a3ec
Merge pull request #962 from CookieNick/mc1.15/paused-sequenced-gearshift
...
Added the 'Paused' instruction for sequenced gearshift
2021-02-19 15:10:14 +01:00
d0357df863
Move stuff of RegistryTrigger over to StringSerializableTrigger to make future expansion possible
2021-02-19 15:08:50 +01:00
simibubi
f363d56cc1
Merge pull request #1115 from FrannDzs/mc1.15/dev
...
Added Spanish language (es_es) [FINISHED]
2021-02-19 15:05:37 +01:00
simibubi
e424245d3a
Merge pull request #1083 from muffinbarde/mc1.15/dev
...
Update de_de.json 1.15/dev
2021-02-19 15:03:25 +01:00
simibubi
13e8f67d05
Merge pull request #900 from SuicidalSteve/mc1.15/dev
...
Omnidirectional Crushing Wheels
2021-02-19 15:01:19 +01:00
589572df6c
kill kinetic block trigger, clean up unused stuff
2021-02-19 14:49:22 +01:00
simibubi
37434f3933
Merge pull request #1045 from TheBv/mc1.15/dev
...
Fixed issues with the blockzapper and FTBChunks
2021-02-19 14:46:48 +01:00
simibubi
fd65acd91d
Merge pull request #1062 from Snownee/mc1.15/dev
...
Bug fixes
2021-02-19 14:22:37 +01:00
667c213506
remove unused light absorb trigger
2021-02-19 14:13:18 +01:00
3f9ee09953
Rework Bracket trigger to now be a registry trigger based on base block
2021-02-19 14:12:26 +01:00
d9aa912796
generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger)
2021-02-19 09:09:29 +01:00
Franco Paladini
7c0d0b6439
Update es_es.json
2021-02-19 00:53:47 -03:00
Franco Paladini
54ca447301
Update es_es.json
2021-02-19 00:53:29 -03: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
7023148e7f
generic infinite fluid triggers
2021-02-18 23:00:17 +01:00
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
Franco Paladini
f27350253d
Merge pull request #2 from muriplz/pr/1115
...
Pr/1115
2021-02-18 15:03:08 -03:00
Franco Paladini
9c1ab785d7
Update es_es.json
2021-02-18 15:00:07 -03: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
muriplz
f8d6f73f8a
Update es_es.json
2021-02-18 12:26:59 +01:00
muriplz
a52865666a
Update es_es.json
2021-02-18 12:19:40 +01:00
