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,317 Commits 31 Branches 14 Tags 106 MiB
6b999fa7d4
Commit Graph

1233 Commits

Author SHA1 Message Date
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
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
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
_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
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
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +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