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,303 Commits 31 Branches 14 Tags 106 MiB
1a315a11cf
Commit Graph

634 Commits

Author SHA1 Message Date
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
simibubi
ca2cf94579 Scene hacking getting out of control 
- New highly over-engineered scenes for Encased Fans
- Potential Fix for GL errors with the framebuffer system
 2021-03-08 02:59:43 +01:00
simibubi
15e88b9bcf Belts 
- Ponder scenes for the belt
 2021-03-07 21:52:11 +01:00
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
JozsefA
25fdf08e11 Fog modes for new rendering. 
- For each fog mode, compile a different version of each shader.
 - Could maybe do some fancier preprocessing to make writing shaders easier?
 2021-03-04 23:43:28 -08: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
8bf82aff79 Refactor Goggles Fluid Information 
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
 2021-03-03 19:17:56 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks 2021-03-03 16:30:59 +01:00
simibubi
2b1c17cb48
Merge pull request #1133 from FrannDzs/patch-2 
Update es_es.json (HOTFIX)
 2021-03-03 16:23:01 +01:00
simibubi
20d8e1d915
Merge pull request #1130 from Alepod/patch-2 
Update ru_ru.json
 2021-03-03 16:22:02 +01:00
simibubi
fe6d9136fc
Merge pull request #1129 from Alepod/patch-1 
Update ru_ru.json
 2021-03-03 16:21:27 +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
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
JozsefA
5499fdbad0 The flappening. 
Tunnel and funnel flaps are now rendered with the new engine.
 2021-03-02 15:54:31 -08: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
grimmauld
1e28bc998a Make contraptions not take that stupid amount of cpu time when in water 2021-03-01 10:37:49 +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
_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
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
JozsefA
e62d89b21c Everything is lit, hopefully all the time now. 2021-02-24 16:52:49 -08:00
simibubi
550744da92 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-24 17:52:20 +01:00
Franco Paladini
d8beae6ee9
Update es_es.json 2021-02-22 03:12:41 -03:00
Franco Paladini
38d406e85d
Update es_es.json 
Updated
 2021-02-22 03:07:02 -03: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
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
Franco Paladini
ffc152ecf2
Update es_es.json (HOTFIX) 
-Translated unfinished strings
-Some improvements and fixes
 2021-02-19 17:16:28 -03: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
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
Alepod
619045a505
Update ru_ru.json 
More mistakes fixed
 2021-02-19 16:44:49 +02:00
Alepod
5a1984eae4
Update ru_ru.json 
Minor typo fixed
 2021-02-19 16:42:25 +02: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
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
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
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
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
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