simibubi
5567e57265
Post-PR datagen
2021-03-03 16:34:10 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks
2021-03-03 16:30:59 +01:00
simibubi
c1c6e5e046
Controlled attachment
...
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
2021-03-03 05:21:58 +01:00
simibubi
5949dd376b
Fixed honey bottles on belt/depots
2021-03-03 02:34:57 +01:00
simibubi
e87849deca
Vector's food expansion
...
- Added honeyed apples
- Added sweet rolls
- Added chocolate glazed berries
- New goggles item model
- Other texture tweaks
2021-03-03 02:30:21 +01:00
1e28bc998a
Make contraptions not take that stupid amount of cpu time when in water
2021-03-01 10:37:49 +01:00
_0Steven
23d7d65bb2
...Right, language datagen is a thing
...
- Actually put the lang stuff in the right files, and generate the other localization files...
2021-02-27 17:24:49 +01:00
_0Steven
8e5b5582f3
Fluid Overlays and Comparator Compat
...
-Add comparator compat to fluid tanks, spouts, and item drains.
-Add goggle overlays to fluid tanks, spouts, item drains, and basins.
-Update goggle item tooltip slightly.
2021-02-27 17:08:35 +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
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
589572df6c
kill kinetic block trigger, clean up unused stuff
2021-02-19 14:49:22 +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
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
c6f82bff5e
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-16 20:29:40 +01: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
Nick Smit
44a3313c12
Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue.
2021-02-06 21:07:24 +01:00
simibubi
88f80c6240
Refresh unfinished/fr_fr template file
2021-02-06 17:48:03 +01:00
3d2edc492b
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-05 21:36:10 +01:00
Snownee
2baa3f9922
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches
2021-02-06 04:16:26 +08:00
simibubi
ff96e80d81
ru_ru.json
...
- Integrated changes to russian localization made by #819 on correct branch to the correct file
2021-02-05 20:31:49 +01:00
simibubi
b3ee203701
fr_fr.json
...
- Reorganize localization file
2021-02-05 20:11:52 +01:00
simibubi
16e871feba
it_it.json
...
- Move lang file to correct location
2021-02-05 20:02:39 +01:00
simibubi
ed84343f38
Merge branch 'mc1.15/dev' into patch-1
2021-02-05 19:59:43 +01:00
simibubi
60c66980c6
datagen pass
2021-02-05 19:55:50 +01:00
simibubi
edf654cd4a
ja_jp.json
...
- Integrate changes to japanese localization from #879 in the correct file
2021-02-05 19:14:06 +01:00
simibubi
078d86de66
en_mx.json
...
- Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed
2021-02-05 18:42:08 +01:00
simibubi
d24851157e
Integrate recent changes to de_de.json
...
- Transfer changes made to the template file in #647 , #648 , #523 to actual lang file
2021-02-05 18:11:18 +01:00
simibubi
c4bc99c3ec
Merge branch 'mc1.15/dev' into patch-3
2021-02-05 17:51:41 +01:00
simibubi
b606a1dc02
Merge pull request #647 from SaurierZockt/patch-2
...
Update de_de.json - needs follow-up changes
2021-02-05 17:49:36 +01:00
simibubi
374f3c9547
Climb or Convey
...
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
2021-02-04 21:02:30 +01:00
Chexet48
2cdf4057f5
Update it_it.json
2021-02-01 22:59:00 +01:00
Chexet48
64a7c432d7
Update it_it.json
2021-02-01 05:56:02 +01:00
Chexet48
951860afc8
Update it_it.json
2021-01-31 16:03:34 +01:00
Chexet48
cd63d92cac
Update it_it.json
2021-01-31 13:45:38 +01:00
Snownee
c5447d5b9c
Add NBTProcessors to enable detailed control to tile data.
...
Add safe check when contraption blocks adding back to world
2021-01-31 14:56:46 +08:00
simibubi
d35bdab51a
The return of dyed belts
...
- Dyes can now be used to change the appearance of Mechanical Belts
- Fluid items containing water can be used to clean dyed belts
2021-01-23 23:00:27 +01:00
fbb1c6b221
Merge remote-tracking branch 'origin/mc1.15/dev' 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
2021-01-22 20:56:46 +01:00
simibubi
525fc03278
Demise of the hopper funnel
...
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
2021-01-22 20:43:59 +01:00
28cd9a1fe1
Druidcraft woodcutter compatibility
2021-01-20 22:36:04 +01:00
simibubi
f47d1e87c1
You were moved
...
- runData
- Tried addressing some redstone activation inconsistencies with disassembled contraptions
2021-01-13 14:55:29 +01:00
