Commit graph

1255 commits

Author SHA1 Message Date
simibubi
47b54b1ae6 Ponder me this
- auto-backtracking is now more generic and works for tag screens
- Ponder entries for water wheel, motor, hand crank and valves
2021-03-07 17:22:18 +01:00
simibubi
3bc2a9e30f Sanity for translators
- Generated lang entries of re-used scenes now refer to the same set of keys
- Scenes for Chain Drive and Chain Gearshift
2021-03-06 18:08:03 +01:00
simibubi
aa0a58b0da Tooltips except it takes one hour per block
- Added and assigned more ponder tags
- Ponder Scenes for cog, large cog, gearbox, clutch, gearshift, and casings
- Fixed TE model data not queried on schematics and ponder scenes
2021-03-06 04:06:49 +01:00
simibubi
83a641c3b8 go teach them
- Ponder scenes for portable storage interface
- More work on tags
- Fixed tag screen on small resolution
2021-03-05 20:54:41 +01:00
simibubi
e2c50663a5 UI and tag enhancements
- Fixed partial ticks on transitions
- Transitions center on clicked components
- Added auto-lang for tags
- Moved some other ui stuff around
2021-03-05 01:36:41 +01:00
zelophed
d590b23aa7 tagging along
- added tags and chapters to the ponder registry
- slightly changed how scenes are registered
- added a back stack to the screen opener and some animations to go along with it
- added a interface for icons drawn into screens
2021-03-04 12:58:26 +01:00
simibubi
2e1129a3a5 Thinking about Gantries
- Added Ponder entries for gantry shafts and carriages
- Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates
- Gantry Pinion -> Gantry Carriage
- Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh
- removed the requirement of editor provided lang keys for text windows
- couple fixes, changes to instructions
2021-03-02 05:53:43 +01:00
simibubi
0a1be94cbb Funnel Fantasy VII
- Finished ponder entries about funnels
- Smart TEs can now enter "virtual mode" to run both client and server code (support for it needs individual adjustment)
- Removed obsolete quads from the andesite funnels' model
- Not enough ponder instructions
- Fixed upright belt items in ponder UI
2021-02-28 23:49:51 +01:00
simibubi
43f0ad1c78 Freeze and Identify
- Ponder scenes can now be paused and analysed, viewing tooltips for targeted blocks in the scene
- During editing, identify mode can be used to move targeted positions to the clipboard
- Ponder-compatible components can be pondered about in identify mode
2021-02-28 01:34:56 +01:00
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
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
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
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