Anvilcraft/Create
2
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-09-21 08:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity
1468 commits 31 branches 14 tags 102 MiB
Commit graph

1468 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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