mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 06:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,332 Commits 31 Branches 14 Tags 106 MiB
0448d3f6f3
Commit Graph

1332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Snownee
b76782364d Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-07 12:17:17 +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
TheBv
932ff3bd01
Merge pull request #1 from Creators-of-Create/mc1.15/dev 
Update
 2021-02-07 01:00:04 +01:00
JozsefA
3e6ef34993 restore arm rendering 2021-02-06 14:39:58 -08: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
Nick Smit
44a3313c12 Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue. 2021-02-06 21:07:24 +01:00
Chexet48
83df83d4be
Update it_it.json 
Added Gantry Pinion and Gantry Shaft, missing in unlocalized entries
 2021-02-06 19:09:29 +01:00
simibubi
2315625c4b Quickfix 
- Fixed gantry shafts able to cause loops in kinetic connectivity when switching to powered state
 2021-02-06 18:11:35 +01:00
simibubi
88f80c6240 Refresh unfinished/fr_fr template file 2021-02-06 17:48:03 +01:00
simibubi
ed997ec85b
Merge pull request #1039 from dindin-glitch/patch-2 
Update fr_fr.json
 2021-02-06 17:45:42 +01:00
Odin
577c0e4912
Update fr_fr.json 
666 Unlocalized
 2021-02-06 17:34:37 +01:00
simibubi
bed5a1d03a
Merge pull request #965 from Snownee/mc1.15/security-patches 
Security patches
 2021-02-06 17:20:58 +01:00
simibubi
85110f3ce8
Merge pull request #906 from Snownee/mc1.15/dev 
Bug fixes
 2021-02-06 16:23:35 +01:00
simibubi
3d8b10d9a7 Gantry improvements 
- Fixed gantry shafts not locking to correct orientations when placed near others
- Gantry pinions can now be kickstarted by player interaction
- Gantry pinions now update properly after being moved onto different gantry shafts
- Fixed Encased Fans not providing kinetic power after being moved by contraption
- Sticky Mechanical Pistons now drag attached structures with them
- Mechanical piston heads and poles now drag their entire piston multiblock with them
 2021-02-06 16:07:22 +01:00
JozsefA
5ba4477ada restore old tile rendering from 3336778052 2021-02-06 02:26:56 -08:00
JozsefA
2aa06b0786 useful debug arg in build.gradle 2021-02-05 22:50:07 -08:00
JozsefA
90993ce8e1 start working on schematic rendering 2021-02-05 22:48:55 -08:00
grimmauld
3d2edc492b Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-05 21:36:10 +01:00
Snownee
25daf28205 Format codes 2021-02-06 04:21:07 +08:00
Snownee
2baa3f9922 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches 2021-02-06 04:16:26 +08:00
Snownee
867b909a0e Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-06 04:10:05 +08:00
simibubi
ff96e80d81 ru_ru.json 
- Integrated changes to russian localization made by #819 on correct branch to the correct file
 2021-02-05 20:31:49 +01:00
simibubi
b3ee203701 fr_fr.json 
- Reorganize localization file
 2021-02-05 20:11:52 +01:00
simibubi
4a357bb729
Merge pull request #1027 from dindin-glitch/patch-2 
Translated a bunch of random things
 2021-02-05 20:05:42 +01:00
simibubi
16e871feba it_it.json 
- Move lang file to correct location
 2021-02-05 20:02:39 +01:00
simibubi
0b55ba2c55
Merge pull request #967 from Chexet48/patch-1 
Update it_it.json
 2021-02-05 19:59:56 +01:00
simibubi
ed84343f38
Merge branch 'mc1.15/dev' into patch-1 2021-02-05 19:59:43 +01:00
simibubi
60c66980c6 datagen pass 2021-02-05 19:55:50 +01:00
simibubi
df6b92cf19
Merge pull request #985 from dunois2737/mc1.15/dev 
Create zh_tw.json
 2021-02-05 19:52:19 +01:00
simibubi
58d2171f02
Merge pull request #896 from LWHK/mc1.15/dev 
[Localization]update CHS translation
 2021-02-05 19:45:47 +01:00
simibubi
f0843f3180
Merge pull request #849 from Merlo17/mc1.15/dev 
Updated zapper recipes to use tags
 2021-02-05 19:30:03 +01:00
simibubi
a5f5204019 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-05 19:14:26 +01:00
simibubi
edf654cd4a ja_jp.json 
- Integrate changes to japanese localization from #879 in the correct file
 2021-02-05 19:14:06 +01:00
simibubi
e42925a365
Merge pull request #758 from Bobisnotap/mc1.15/dev 
- Adjusted compat recipe for 'atmospheric'
 2021-02-05 19:01:57 +01:00
Odin
ef3d4df944
Translated a bunch of random things 2021-02-05 18:59:58 +01:00
simibubi
2a035a7636
Merge pull request #749 from Chubzik1/patch-1 
Small fix for an incorrectly translated line
 2021-02-05 18:51:15 +01:00
simibubi
5f2f02dab0
Merge pull request #743 from garyyo/mc1.15/dev 
Added missing ae2 compatibility recipe.
 2021-02-05 18:50:14 +01:00
simibubi
078d86de66 en_mx.json 
- Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed
 2021-02-05 18:42:08 +01:00
simibubi
d24851157e Integrate recent changes to de_de.json 
- Transfer changes made to the template file in #647, #648, #523 to actual lang file
 2021-02-05 18:11:18 +01:00
simibubi
ebb70c128e
Merge pull request #648 from SaurierZockt/patch-3 
Update de_de.json - needs follow-up changes
 2021-02-05 17:52:05 +01:00
simibubi
c4bc99c3ec
Merge branch 'mc1.15/dev' into patch-3 2021-02-05 17:51:41 +01:00
simibubi
b606a1dc02
Merge pull request #647 from SaurierZockt/patch-2 
Update de_de.json - needs follow-up changes
 2021-02-05 17:49:36 +01:00
simibubi
66b83c1250 Update Localization Readme.txt 2021-02-05 17:48:41 +01:00
JozsefA
d50e07369b flywheels render with the new tech, and therefore have more accurate lighting 2021-02-04 19:21:25 -08:00
simibubi
72ec08ddfa Asset attack 
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
 2021-02-04 23:46:59 +01:00