Commit Graph

46 Commits

Author SHA1 Message Date
Tschipp
424c699f66 Artifacts 2017-09-12 23:59:41 +02:00
Tschipp
77058317cd Merge branch 'master' into 1.12 2017-09-04 18:35:23 +02:00
Tschipp
87e13fa8e6 Hotfix 2017-09-04 18:28:45 +02:00
Tschipp
7dc848f891 Merge branch 'master' into 1.12 2017-09-03 18:32:07 +02:00
Tschipp
e603944f2e Bugfixes 2017-09-03 17:56:10 +02:00
Tschipp
b4532bd9fa update to 1.3 2017-08-27 22:50:06 +02:00
Tschipp
386cd5d2f6 Merge branch 'master' into 1.12 2017-08-27 22:39:01 +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
10ea3ae8ea Update to 1.2 2017-08-20 01:10:16 +02:00
Tschipp
6f3fb079c9 Arm sneak rotation 1.12 2017-08-20 00:28:21 +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
Tschipp
6220fd13af Started working on ability to pick up entities 2017-08-16 00:27:18 +02:00
Tschipp
e7f9e46fc1 Fixed Crash 2017-08-15 14:31:30 +02:00
Tschipp
44e1804527 Fixed Crash 2017-08-15 14:30:49 +02:00
Tschipp
89961312c9 Merge branch 'master' into 1.12 2017-08-15 14:25:31 +02:00
Tschipp
578f124c48 Arm rotation now respects sneaking 2017-08-15 14:23:54 +02:00
Purplicious_Cow
dcfaee195e Fixed dupe rendering if models already rendered 2017-08-15 12:04:04 +02:00
Tschipp
47f87d6df4 Config Errors no longer crash the game but log the error 2017-08-15 11:56:52 +02:00
Tschipp
ca5515cf5b renderArm 2017-08-14 23:00:08 +02:00
Tschipp
b69c05fcc2 Merge branch 'master' into 1.12 2017-08-14 22:59:14 +02:00
Tschipp
5c4dc41662 Merge remote-tracking branch 'origin/master' 2017-08-14 22:50:36 +02:00
Tschipp
0aa337d376 Added Update JSON and changed Version Number 2017-08-14 22:50:25 +02:00
Purplicious_Cow
7e12d90ce0 Render Arm fixes... texture, rotation, and show in first person 2017-08-14 22:49:16 +02:00
Tschipp
b1d91bf29d Merge branch 'master' into 1.12 2017-08-14 14:54:06 +02:00
Tschipp
fd32bbf31a Added Two new Config Options 2017-08-14 14:52:34 +02:00
Tschipp
ebf6f928bc Fixed Keybinds 2017-08-14 11:12:54 +02:00
Tschipp
19b4a4ebd8 Update to 1.12 2017-08-14 09:53:45 +02:00
Purplicious_Cow
ff2ab06f72 Render Fix arms 2017-08-13 00:26:13 +02:00
Tschipp
d5affb3a5a Multiplayer Bugfixes 2017-08-12 21:30:03 +02:00
Tschipp
2415e5db13 Bugfixes 2017-08-12 15:47:34 +02:00
Tschipp
ecec5eb3ca Added Model Override Config and Arm rotation 2017-08-12 14:01:28 +02:00
Tschipp
7e72a96317 Changes 2017-08-11 20:15:00 +02:00
Tschipp
7dcec8e885 Initial Push 2017-08-11 11:03:51 +02:00