mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 07:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,246 Commits 31 Branches 14 Tags 106 MiB
692c6deaaf
Commit Graph

1246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
simibubi
692c6deaaf More pondering 
- First couple of funnel scenes
- More utility methods
- Scene progress bar
- An inspect mode that does nothing
 2021-02-26 19:46:56 +01:00
simibubi
550744da92 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-24 17:52:20 +01:00
simibubi
051a32557f Desperate Control 
- Belt items and item entities now support element links (albeit in a slightly limited fashion)
 2021-02-24 17:48:45 +01: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
simibubi
9d4e52092e Basic item simulation 
- Support for generic entities inside ponder scenes
- Instructions for manipulating/creating entities
- Client-side belts are now slightly smarter inside a ponder world
- Some doc for the doc
 2021-02-21 19:29:23 +01:00
zelophed
46daa3f699 composting, but fancy 
- add the composter as a mechanical arm interaction point
 2021-02-21 18:12:19 +01:00
simibubi
c4e1f680c9 Such convenience 
- Organized util and scene builder methods into nested classes
- Selection rework, allows for addition and substraction
- World sections now merge into a global world section after fading in
- Support for managing reference to elements created by previous instructions
- more util
- Support for animating world sections to roughly simulate a contraption
- Less paperwork for making new scenes
- Support for outliner chaseAABB
- Support for outlining selections
 2021-02-21 03:18:04 +01:00
JozsefA
b5f9cbc4b3 improve compatibility layer. 2021-02-20 15:22:07 -08:00
grimmauld
f6b9d71169 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-20 17:58:25 +01:00
grimmauld
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
45fc0ca7ee post-merge fixup 2021-02-19 20:21:29 +01:00
simibubi
b61dc0d562 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-19 18:03:34 +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
grimmauld
a3f2fbe788 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-19 16:39:11 +01:00
grimmauld
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
grimmauld
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
grimmauld
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
grimmauld
667c213506 remove unused light absorb trigger 2021-02-19 14:13:18 +01:00
grimmauld
3f9ee09953 Rework Bracket trigger to now be a registry trigger based on base block 2021-02-19 14:12:26 +01:00
grimmauld
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
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
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
simibubi
203ca6f849 Birbs and Click input 2021-02-18 15:44:18 +01:00