Commit Graph

70 Commits

Author SHA1 Message Date
Tschipp
32a837eb39 Merge branch 'master' into 1.10 2017-10-07 18:18:23 +02:00
Tschipp
ecfe850a99 Scripting now works on Servers 2017-10-07 18:16:47 +02:00
Tschipp
b42d538049 Client-Server Script desync 2017-10-03 17:04:53 +02:00
Tschipp
acd0f06e4f Merge branch 'master' into 1.10 2017-10-03 16:45:47 +02:00
Tschipp
416124c9d2 Blacklisted Botania 2017-10-03 16:45:11 +02:00
Tschipp
f4ae211a6a Command 2017-10-01 21:25:02 +02:00
Tschipp
a4fcb39cb6 Merge branch 'master' into 1.10 2017-10-01 21:24:53 +02:00
Tschipp
7d8ade14ec Version Number 2017-10-01 19:27:50 +02:00
Tschipp
816b0350a2 Added option to not render arms at all 2017-10-01 19:19:19 +02:00
Tschipp
99709703d8 Added Arm rotation for scripting and increased script performance 2017-10-01 17:57:08 +02:00
Tschipp
33066df231 Significantly increased load time when using many mods 2017-09-28 17:27:56 +02:00
Tschipp
604a8fe8e1 Added Scripting Again .-. 2017-09-28 17:09:51 +02:00
Tschipp
55abd543a5 Merge remote-tracking branch 'origin/master' 2017-09-28 16:52:01 +02:00
Tschipp
ec04f72cc6 Script Checker Entity/Block Conditional 2017-09-28 16:51:55 +02:00
SteveKunG
703e7d9a23 Model initialization/lighting optimize 2017-09-22 23:56:47 +07:00
SteveKunG
a49d01f170 Fix tile entity render in hand 2017-09-22 23:02:56 +07:00
SteveKunG
9fdaf26e99 Fix entity render in hand 2017-09-22 23:02:32 +07:00
Tschipp
82e43a37e5 Merge pull request #35 from SteveKunG/patch-3
Bug fixes
2017-09-21 22:23:36 +02:00
Tschipp
57252bbae9 Added Scripting 2017-09-21 22:23:06 +02:00
SteveKunG
555af2184f Bug fixes 2017-09-21 13:10:10 +07:00
SteveKunG
ef6d78fc2d Minor fixes for 2nd Right Arm rotation
Also checking the game setting if players enabled Left and Right sleeve.
2017-09-19 20:58:43 +07:00
SteveKunG
2e090805c1 Fixed 2nd skin layer rotation 2017-09-18 23:08:26 +07:00
Tschipp
ac4a3d6a14 Merge branch 'master' into 1.10 2017-09-18 17:06:08 +02:00
Tschipp
4b70322112 Fixed Minecart dupe glitch 2017-09-18 17:03:47 +02:00
Tschipp
9a38b115b7 Merge branch 'master' into 1.10 2017-09-17 22:44:37 +02:00
Tschipp
058398cd2d ok real fixed it 2017-09-17 21:27:29 +02:00
Tschipp
12f066901a 1.5 2017-09-17 19:27:06 +02:00
Tschipp
28b7fdc124 Merge branch 'master' into 1.10 2017-09-04 18:30:20 +02:00
Tschipp
87e13fa8e6 Hotfix 2017-09-04 18:28:45 +02:00
Tschipp
a757659d68 Oops 2017-09-03 18:18:14 +02:00
Tschipp
295310b603 Merge branch 'master' into 1.10 2017-09-03 18:11:32 +02:00
Tschipp
e603944f2e Bugfixes 2017-09-03 17:56:10 +02:00
Tschipp
780faaeca3 Merge branch 'master' into 1.10 2017-08-27 22:35:22 +02:00
Tschipp
a1c4313e50 fixed a bug 2017-08-27 22:23:02 +02:00
Tschipp
66dffa7350 Fixed Keybinds and updated version number 2017-08-27 22:14:20 +02:00
Tschipp
15b2226da1 Merge remote-tracking branch 'origin/master' 2017-08-27 21:31:00 +02:00
Tschipp
7509e52c8c Added Keybind for carrying 2017-08-27 21:30:24 +02:00
Purplicious_Cow
bb157fcb6a Renderrific
Updated arm render to only show remove Carry On arms. Fixed dimness when carrying entities at night. Added config. 1.11.2 only.
2017-08-27 21:28:03 +02:00
Tschipp
2b4a0a7b4d Merge remote-tracking branch 'origin/master' 2017-08-21 22:25:39 +02:00
Tschipp
24fdee0125 Fixed ItemTile and updated Update JSON 2017-08-21 22:25:35 +02:00
Purplicious_Cow
2b5b87d3da Flicker fix (1.11.2 only) 2017-08-20 23:32:49 +02:00
Tschipp
20294c004d Update to 1.2 2017-08-20 00:26:58 +02:00
Tschipp
8848759b30 Entity Names 2017-08-19 23:34:02 +02:00
Tschipp
da3367cec4 Merge remote-tracking branch 'origin/master' 2017-08-19 23:20:33 +02:00
Tschipp
ec60f185e8 Custom Pickup Overrides, FTBUtils Integration 2017-08-19 23:19:24 +02:00
Purplicious_Cow
e0e9e979dd Fixes
Gui at night while carrying entities, arrows causing console spam, height of carried entity in first person, entity name
2017-08-19 19:30:21 +02:00
Tschipp
b787aec975 Merge remote-tracking branch 'origin/master' 2017-08-16 22:28:47 +02:00
Tschipp
f187d6295f Biome Color Rendering, Change to model overrides 2017-08-16 22:25:56 +02:00
Purplicious_Cow
68dc8dd9f2 Auto stash before merge of "master" and "origin/master" 2017-08-16 21:59:56 +02:00
Tschipp
ecbc1e1fcf Fixed double arms again 2017-08-16 01:17:30 +02:00