mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity
1723 commits 31 branches 14 tags 107 MiB
Commit graph

1648 commits

Author SHA1 Message Date
JozsefA
9a545a09a4 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-15 15:58:51 -07:00
JozsefA
e1c16d869d Some semblance of immersive portals compat. 
- Each world gets its own KineticRenderer now.
 2021-03-15 15:58:41 -07:00
simibubi
e38d85a633 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-15 23:20:26 +01:00
simibubi
d9027c1d99 Logic Thinking 
- Ponder scenes for various redstone components
 2021-03-15 23:20:24 +01:00
JozsefA
52eed2bab3 Instanced Gauges and Valves, DRY lighting. 2021-03-15 14:20:13 -07:00
Snownee
a534d2230c Implement extra area for schematic table 2021-03-16 00:28:45 +08:00
Snownee
8281c5746a Fix ponder particles weirdness 2021-03-15 17:00:42 +08:00
Snownee
411925033e Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-15 13:02:05 +08:00
Snownee
0ca388141c Better line breaking 2021-03-15 13:00:55 +08:00
simibubi
f1b940ea18 Cutting imaginary trees 
- Fixed TEs not ticking properly when wrap-around-skipping to a keyframe
- Added a block restoration instruction
- Scenes for the Saw
- runData catching up
 2021-03-15 05:49:29 +01:00
simibubi
2bf9672d92 hotfix 
- Oops. That didn't compile
 2021-03-14 23:26:05 +01:00
simibubi
dac1cf0303 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-14 21:12:04 +01:00
simibubi
a8dc4f3622 Broken Breaking 
- Painful implementation of virtual block breaking overlay
- Scenes for the Mechanical Drill
 2021-03-14 21:12:02 +01:00
JozsefA
b71c831a07 Lieutenant Scatterbrain. 
- User no longer has to manually add instances, new hook instead.
 - Use registrate for InstanceFactories.
 - Instanced levers.
 - Instanced hand cranks.
 - Reorganize PhysicalFloat and LerpedFloat.
 2021-03-13 20:45:24 -08:00
simibubi
a40d0f58c2 Pondering about sticky stuff 
- Scenes for chassis, super glue, stickers and redstone contact
- Added a warning when players try to use experimental rendering while shaders are active
 2021-03-13 18:24:10 +01:00
JozsefA
d735d237ec Ghost blocks are less spooky. 2021-03-12 20:20:14 -08:00
JozsefA
a1e10a5c3c Belt speed = item speed and secret wrench fix. 2021-03-12 16:33:01 -08:00
JozsefA
f14661fb6f Pondering: the beginning and the end. 
- Special-case seeking to the end of a ponder scene.
 - Draw indicators for seeking to the beginning and end.
 - Fix pulleys not rendering correctly.
 2021-03-12 14:03:21 -08:00
simibubi
841bba04bd Pondering too quickly 
- Fixed idle instruction only idling for t-1
- Made keyframe skipping a little easier
- Added option to register keyframes as part of a text window builder
- PonderUI now stalls the scene briefly after skips
 2021-03-12 20:42:37 +01:00
simibubi
678ddfa764 Spoutput blockage 
- Fixed basin auto-output not working on stopped belts
- Basin auto-output can now share a space with funnels
- Linear chassis no longer allow sticky sides facing a directly attached linear chassis of the same type
 2021-03-12 18:44:05 +01:00
Snownee
af9ed3e44b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-12 23:51:20 +08:00
Snownee
6baa519973 Fix cart assembler duplication (closes #1058, #1150) 2021-03-12 23:46:26 +08:00
zelophed
438ac99b2d fix dist issues for dedicated server 2021-03-12 15:51:25 +01:00
zelophed
51c919e4d8 too much assist 
- add a configurable range to placement helpers i.e. the pole helper specifically
 2021-03-12 03:47:36 +01:00
JozsefA
154000290e Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
 2021-03-11 16:34:46 -08:00
JozsefA
f9eb4dd2e7 Pondering back and forth. 
- Only about gantries so far.
 - Reduce Backend log spam.
 2021-03-11 15:59:26 -08:00
Kryppers
5e5289fcb0 Update secondary_linear_chassis_side_connected.png 2021-03-11 23:50:58 +00:00
grimmauld
f115233197 Fix leave finding in saws so compatibility with other mods works 2021-03-11 20:31:23 +01:00
simibubi
2a8c3debeb Captain Distracto, Part II 
- Linear Chassis now connect to each other in any direction
 2021-03-11 19:51:58 +01:00
grimmauld
d38f49fab6 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-11 18:39:22 +01:00
grimmauld
59303fea2f Extend /create ponder command functionality 2021-03-11 18:39:12 +01:00
zelophed
0448d3f6f3 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-11 15:29:40 +01:00
zelophed
60dbb931c1 double stick 
- prevent super glue from being placed on already sticky faces
 2021-03-11 15:27:17 +01:00
simibubi
4445872959 Stop hacking the base plate size 
- Added proper scene scale/alignment instructions
 2021-03-11 13:48:31 +01:00
zelophed
7eb0b95ab9 easier crank interaction 
- allow some blocks to be used while sneaking and holding an item
 2021-03-11 12:55:44 +01:00
simibubi
d1e96c3b4b Timewarp 
- Added user view mode for editors to hide coordinates
- Ponder now pauses the game in SP
- Ponder elements now use a separate timer and separate partial ticks
- Fixed virtual funnels not flapping
- Fixed ponder buttons having hover highlights when not clickable
- Fixed ponder button mouse hitbox
- Addressed strange render state bleed with identify mode highlighting
 2021-03-11 11:35:34 +01:00
JozsefA
ea90196250 Clocks are lit. 
- ClockworkContraptions and BearingContraptions now both use the same lighter type.
 2021-03-11 01:17:01 -08:00
simibubi
c73e3166cb Contraption Ponder Push 
- Scenes for Pulley, Piston, and Clockwork Bearing
 2021-03-11 03:32:18 +01:00
JozsefA
c54d80a161 Better bounding boxes for bearings. 
- Fix bug causing entities to slip off the far corners of bearing contraptions.
 - This was already implemented for BearingLighter.java, now it's promoted to Contraption.java.
 - Promote anonymous WrappedWorld in Contraption.java to inner class.
 2021-03-10 17:08:20 -08:00
JozsefA
b7f0fe9b10 Oops engine stuff is okay again. 2021-03-10 16:09:17 -08:00
JozsefA
d0a6f4123b Instanced flywheels, engines, and schematicannons. 2021-03-10 13:44:04 -08:00
simibubi
d8ab00b66e Pondering about Mechanical Bearings 2021-03-10 19:18:25 +01:00
JozsefA
2ddf57cd76 Instanced mixers and presses. 2021-03-09 15:46:15 -08:00
JozsefA
dcea504184 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-09 14:23:40 -08:00
JozsefA
95eabe9cf9 Instanced arms. 2021-03-09 14:22:20 -08:00
simibubi
cb063d161c Pondering about Windmills 2021-03-09 21:17:02 +01:00
simibubi
6b999fa7d4 Tag hopping 
- Ponder UIs opened from a tag screen now skip to the first scene with a matching tag if available
 2021-03-09 17:32:01 +01:00
simibubi
d252a204ef Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-09 04:24:48 +01:00
simibubi
d61b840c5c Back to fighting Minecarts 
- Fixed Minecart Contraptions started on a powered rail facing in unwanted directions
- Fixed powered rail Cart Assemblers not respecting the solid block rule of powered rails
- Fixed Minecart contraption items not facing away from the player when placed
- Polished every last bit of the belt uvs
 2021-03-09 04:24:45 +01:00
zelophed
a91360a7b9 changing format 
- goggle overlays now use a localized number format
- minor changes to the layout of the ponder index screen
 2021-03-09 03:45:05 +01:00
simibubi
62c3ae4040 Captain Distracto 
- Removed processing recipes from recipe book
- Reorganized items in creative tab
- Tweaked a few model transforms
- Fixed belt uvs
- ponder birbs can now face the cursor
- fix interpolation on ponder birbs
- Fixed log spam when assembling certain blocks (Points of interest) in a contraption
- Fixed content observers not triggering for in-line belt funnels
 2021-03-09 01:49:49 +01:00
JozsefA
33d718d653 Check if worlds support the flywheel backend. 2021-03-08 15:24:58 -08:00
JozsefA
2b37842259 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-08 14:04:25 -08:00
simibubi
6c8fe67fd4 Gradle Mondays 
- Replaced ponderworld particle AT with reflection
- Symmetry Wand now checks for placement permissions
- Lang now uses Locale.ROOT
- Fixed crash using ponder without advanced tooltips enabled
 2021-03-08 22:12:25 +01:00
JozsefA
e943705fb7 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/AllTileEntities.java
#	src/main/resources/META-INF/accesstransformer.cfg
 2021-03-08 11:06:35 -08:00
simibubi
bea60ccb86 Fix build issues 2021-03-08 17:42:50 +01:00
simibubi
21d87a0cfe Change mixin repo 2021-03-08 17:29:42 +01:00
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
JozsefA
b31f4d09bd Housekeeping. 2021-03-08 02:27:56 -08:00
JozsefA
8ce0f47f01 No more 7 circles of callbacks. 
- Instead of using consumers to edit instance data, just give the user a pointer to the data.
 - Easier to use, more predictable access.
 2021-03-08 02:02:47 -08:00
JozsefA
d0e5be24d7 Transformed models. 2021-03-08 00:36:23 -08: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
JozsefA
bb3fed2a3b Towards better normals. 
- Easier SuperByteBuffer transform settings.
 - Some cleanup here and there.
 2021-03-06 21:46:17 -08:00
JozsefA
e930e62436 Belting these bugs. 
- Belts now always render their items again.
 - Items on belts on contraptions are now at least somewhat lit.
 2021-03-06 15:08:46 -08:00
JozsefA
25b4e4d5be The bell tolls for this bug. 
- Fix MovementBehavior#onSpeedChanged not ever being called.
 2021-03-06 14:33:01 -08: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
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
MRH0
40fef0eaf9 Update KineticTileEntity.java 2021-03-05 00:50:51 +01:00
JozsefA
b511a20814 Flappy packets. 
- Instead of sending the entire tile entity (and maybe even chunk), send just what we need to.
 - Avoids unnecessary chunk rebuilds when flaps flap.
 - Beginning of a larger process to replace calls to SyncedTileEntity#sendData
 2021-03-04 15:34:17 -08: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
JozsefA
9062f1c8fa Null checks and flap updates. 2021-03-03 17:15:45 -08:00
JozsefA
fe492c5d75 Better instance deletions. 
- Defer element removal until just before the model is drawn.
 - Use a modified version of ArrayList#removeIf to delete the instances and adjust the keys.
 2021-03-03 17:14:19 -08:00
JozsefA
9d77f85b94 Fix crash on world reload. 2021-03-03 13:10:44 -08:00
grimmauld
93973004c8 Seats don't Like deployers. They just don't. 2021-03-03 19:33:15 +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
31cb704894 Refactor comparator overrides 
- Removed unnecessary level tracking
- Remove code duplicates
- Fixed smart fluid tank behaviours not triggering markDirty on deferred fluid update
 2021-03-03 17:59:27 +01:00
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
325ca68917
Merge pull request #1138 from SuicidalSteve/mc1.15/dev 
[Bugfix] Make omnidirectional entity crushing more consistent.
 2021-03-03 16:23:46 +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
JozsefA
b1dc36d358 Trying to tick everything is slow. 
- Keep track of tickable instances separately.
 2021-03-03 02:37:04 -08: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
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
JozsefA
55f1b538b5 Only contraptions use EBOs now. 
Tight light bounds for bearing contraptions.
 2021-02-27 21:35:45 -08:00
JozsefA
884f19d518 Fix issue when rendering very large contraptions. 2021-02-27 18:29:35 -08:00
JozsefA
3a2771c5c0 Fix issue restricting the maximum size of contraptions. 2021-02-27 18:24:48 -08: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
_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
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
6dc4a18ed3 Extra safety checks. 2021-02-25 17:16:22 -08:00
zelophed
e1644c11e2 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-25 19:03:23 +01:00
zelophed
46bbdc70c9 small command adjustments 2021-02-25 19:03:07 +01: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
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
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
RakuGaki-MC
6a5d0a00c7
fix 
fix
ちょっと修正
 2021-02-22 17:47:52 +09:00
RakuGaki-MC
4dc0b107e6
Update ja_jp.json 
[mc1.16/dev] update & fix
 2021-02-22 17:16:24 +09: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
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
_0Steven
41cb2ad937 Stop explody crusher drops 
- Remove the velocity of item entities dropped by crushed mobs so they fall neatly onto belts rather than exploding everywhere.
 2021-02-20 18:50:40 +01:00
grimmauld
77d5c00949 merge cleanup 2021-02-20 18:00:16 +01: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
grimmauld
31e3c5b0bd Port recent changes 2021-02-20 17:27:51 +01:00
_0Steven
a32cbe15a3 Consistently Crushing Entities 
- Fix known issue with omnidirectional crushing wheels inconsistently moving crushed mob drops to the output location.
 2021-02-20 15:08:58 +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
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
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
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
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
simibubi
355a1dd95d Port new changes 2021-02-19 00:50:05 +01:00
simibubi
4ee9dd8a8a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-19 00:49:39 +01: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
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
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
muriplz
310cbd484c Update es_es.json 2021-02-18 12:09:09 +01:00
JozsefA
9b4d53d452 fix one residual merge conflict. 
creating matrix stacks is expensive, but correct.
 2021-02-17 14:27:49 -08:00
JozsefA
24ab4e181f Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering 
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/META-INF/accesstransformer.cfg
 2021-02-17 14:06:13 -08:00
JozsefA
02db3f5a2c fix some problematic code. 
creating matrix stacks is expensive, apparently
 2021-02-17 13:58:24 -08:00
Franco Paladini
22c03c4a14
Update es_es.json 
accents suppressed
 2021-02-17 16:56:09 -03:00
Franco Paladini
9048442fec
Update es_es.json 2021-02-17 16:52:50 -03:00
Franco Paladini
607ce9edca
Update es_es.json 2021-02-17 16:43:06 -03:00
Franco Paladini
9d57a25104
Update es_es.json 2021-02-17 16:42:37 -03:00
Franco Paladini
bd49e9bc7f
Update es_es.json 2021-02-17 16:39:07 -03:00
Franco Paladini
2f9607a196
Update es_es.json 2021-02-17 16:29:35 -03:00
JozsefA
a5d6262424 fix mechanical crafter cogs 2021-02-17 11:24:40 -08:00
Franco Paladini
d187dc0b38
Update es_es.json 2021-02-17 14:50:28 -03:00
Zelophed
159e298e8b paletted contraptions 
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
 2021-02-17 17:21:31 +01:00
Franco Paladini
a4c96be51c
Update es_es.json 2021-02-17 08:24:41 -03:00
Franco Paladini
36553c6ee0
Update es_es.json 2021-02-17 01:01:01 -03:00
Franco Paladini
c4c57c6ba1
Update es_es.json 2021-02-16 23:41:47 -03:00
JozsefA
7aa175dd9c fix gantry cogs skipping every half rotation 2021-02-16 15:13:48 -08:00
Franco Paladini
ed04fd1d52
Update es_es.json 2021-02-16 19:54:49 -03:00
JozsefA
d2e30eeab5 finish merge 
remove old assets
 2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
grimmauld
716f79872c Actually port 2021-02-16 20:52:26 +01:00
grimmauld
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
grimmauld
08562d2689 preliminary merge 2021-02-16 20:21:42 +01:00
simibubi
fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c Ponder 
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
 2021-02-16 19:35:26 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished) 2021-02-16 13:59:05 -03:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge 
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
 2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV 
- added 👻-blocks as a placement preview
 2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values. 
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
 2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9 Add max stack size check to ItemHelper.extract 2021-02-14 11:51:31 +08:00
Snownee
676a05ad07 Fix rose quartz duplication glitch (#1104) 2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769 contraption actors take into account self lighting 2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7 cache KTEs' renderBoundingBox 2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f Avoid unnecessary piston contraption assembling 2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4 probably fix issue with phosphor crashing contraptions 2021-02-12 21:11:35 -08:00
Snownee
dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262 whoops null pointer is no more 2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1 kinda separate system capability stuff, should probably clean this up more. 
fix lighting glitches on world load.
 2021-02-12 16:36:20 -08:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
JozsefA
d824304f12 tile entities on contraptions account for self lighting 2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472 these are somewhere else too 2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff better vertex attributes. 
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
 2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319 Player Feedback, Part III 2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6 some attrib stuff 2021-02-11 14:31:50 -08: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
muffinbarde
5f6c94939c
Update de_de.json 2021-02-11 17:21:05 +01:00
JozsefA
3820e11954 get it working again 2021-02-11 02:26:30 -08:00
JozsefA
02114b1d9a begin 2.0 compatibility push, probably not going to be ready for the next release 2021-02-10 17:14:03 -08:00
Zelophed
f3fd32edd3 Assisted Placement, Part III 
- blocks placed by helpers make sounds again
- helpers now trigger the proper event and can be cancelled
 2021-02-11 00:28:47 +01:00
simibubi
fd3d7bd7fd Refined animations, key input 2021-02-10 16:40:30 +01:00
JozsefA
e93562569b world fog works, fluid fog still doesn't. 
better dimension changes.
 2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90 Localize Fixes 2021-02-10 13:07:41 +09:00
simibubi
e178cab4a8 Multiple scenes per doc 2021-02-10 03:13:33 +01:00
JozsefA
0cb9094913 non experimental contraption rendering is back. 
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.

maybe fix belt lighting, again.
remove old belt assets.
 2021-02-09 16:14:44 -08:00
simibubi
6836bd97f4 First Steps 2021-02-09 22:34:14 +01:00
JozsefA
6736577e1b fix the rainbow debugger 2021-02-08 21:38:45 -08:00
JozsefA
cfff806df4 some micro optimizations. 
cache hot getters.
reduce number of calls to getBeltFacing() in BeltRenderer.
preserve floating point accuracy over (insanely) long play times.
rotate some normals and light some quads.
 2021-02-08 21:17:25 -08:00
simibubi
4a5479838c Merge branch 'mc1.15/dev' into mc1.15/metadoc 2021-02-08 16:51:52 +01:00
Snownee
607dbbfb90 Fix PSI item dupe 2021-02-08 22:40:55 +08:00
JozsefA
ee9962b27b fix some new rendering issues that popped up after the revert 
proper? optifine shader handling. could use more testing
 2021-02-07 22:11:29 -08:00
JozsefA
c9ff31b099 hot swappable rendering 
kind of detects optifine
still some kinks to work out
 2021-02-07 14:15:52 -08:00
Chexet48
05e62ced51
Update it_it.json 2021-02-07 22:51:43 +01:00
simibubi
dd94cdd3f8 Register world features properlyTM, Part II 
- Re-enabled ability to control create world-gen with a global flag
 2021-02-07 21:32:37 +01:00
simibubi
dc13ea6485 Register world features properlyTM 
- Refactored Create's config-driven worldgen to better work with the feature infrastructure of 1.16. Adresses #539
 2021-02-07 21:27:55 +01:00
simibubi
cb2c56d772 Gantry shaft placement assist 2021-02-07 18:09:08 +01:00
Snownee
16991c2ce8 Fix NPE while deployer on a contraption trying to disassemble self 2021-02-07 15:49:25 +08:00
s0127943
d8054775d5 Removed unnecessary blocksnapshot.restore 2021-02-07 01:03:53 +01:00
s0127943
f3b6a684f9 Added check to see if a user is allowed to place blocks in the given position to counteract issues with FTBChunks 2021-02-07 01:01:48 +01:00
JozsefA
3e6ef34993 restore arm rendering 2021-02-06 14:39:58 -08:00
simibubi
01a83722cf
Merge pull request #1041 from Creators-of-Create/mc1.16/compat-fix-redux 
Repair renamed recipes
 2021-02-06 22:44:03 +01:00
simibubi
9077e99c4f Restore cache 2021-02-06 22:43:27 +01:00
simibubi
a8d04cc152 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 22:43:01 +01:00
simibubi
6981848f8a Clean-up 
- Fixed smart chutes not filtering properly
- Fixed chutes not treating smart chutes like chutes
- Removed code leftovers
- Removed datagen cache from gitignore
 2021-02-06 22:41:20 +01:00