Commit Graph

29 Commits

Author SHA1 Message Date
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
Tschipp
6220fd13af Started working on ability to pick up entities 2017-08-16 00:27:18 +02:00
Tschipp
0bad034983 Fix 1.10 2017-08-15 14:42:58 +02:00
Tschipp
d5ff19cdc2 Merge branch 'master' into 1.10 2017-08-15 14:35:52 +02:00
Tschipp
e7f9e46fc1 Fixed Crash 2017-08-15 14:31:30 +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
1036890e39 Merge branch 'master' into 1.10 2017-08-14 23:06:33 +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
95b56d78a8 Merge branch 'master' into 1.10 2017-08-14 15:00:26 +02:00
Tschipp
fd32bbf31a Added Two new Config Options 2017-08-14 14:52:34 +02:00
Tschipp
f60ee55fbe Downdate to 1.10 2017-08-14 11:08:00 +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