Commit graph

804 commits

Author SHA1 Message Date
Arcaratus
06df5f5e39 Fix Entities 2015-07-20 19:56:29 -04:00
WayofTime
8d7d587e01 Arm now renders over all layers. 2015-07-19 21:07:45 -04:00
WayofTime
724f09c130 More arm stuffs! 2015-07-19 19:06:22 -04:00
WayofTime
32e6539deb More attempts at the armour rendering, and an attempt to fix the entities. 2015-07-19 17:01:18 -04:00
WayofTime
19ed528d13 Experimentation with rendering the armour of the player. 2015-07-19 14:44:12 -04:00
WayofTime
bf068d1487 Fully fixed elementals. 2015-07-18 16:38:47 -04:00
Arcaratus
098d86596b Merge branch 'master' of https://github.com/WayofTime/BloodMagic
Conflicts:
	src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
2015-07-18 10:08:42 -04:00
WayofTime
ebad8a2e29 Changes to Demons 2015-07-18 10:05:23 -04:00
Arcaratus
461c2127be Fixed Elemental Crash 2015-07-18 10:02:06 -04:00
WayofTime
d6a57ca644 Fix #169 2015-07-17 17:07:39 -04:00
WayofTime
12765e865b Fixed API calls. 2015-07-17 12:07:38 -04:00
WayofTime
9b7b419ec8 Arcaratus and Vanilla are derps. 2015-07-16 18:29:53 -04:00
WayofTime
1ca7795164 Merge pull request #387 from Arcaratus/master
Refixed the Dismantler
2015-07-16 09:48:08 -04:00
Arcaratus
74f4e4f224 Refixed the Dismantler 2015-07-16 09:46:30 -04:00
WayofTime
77ae114b02 Merge pull request #386 from Arcaratus/master
Fixed Ritual Dismantler
2015-07-16 09:31:56 -04:00
Arcaratus
2557e02018 Fixed Ritual Dismantler 2015-07-16 09:29:21 -04:00
WayofTime
1bbf76063c Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-13 17:37:03 -04:00
WayofTime
82244a357b Removed useless shader class. 2015-07-13 17:36:53 -04:00
Arcaratus
2d6b1c4462 Add achievements 2015-07-13 14:25:10 -04:00
Arcaratus
0d9db7def1 Fix #381 2015-07-10 16:52:39 -04:00
Arcaratus
09b2c0cbd7 Redo Commit 2015-07-09 11:24:20 -04:00
Arcaratus
c607817bcd Fix #373 and did #375 2015-07-09 11:17:55 -04:00
WayofTime
786498e615 Removed redundant book code. 2015-07-08 22:03:38 -04:00
WayofTime
723a8b4a7e Merge pull request #314 from Adaptivity/master
Make some messages localized serverside
2015-07-07 14:24:17 -04:00
Arcaratus
3328c4db74 Fix #370, #367 2015-07-06 18:50:15 -04:00
Arcaratus
e5b795fddc Performance Commit --Too lazy to do the Altar recipe 2015-07-02 11:05:07 -04:00
Arcaratus
96d271a5ee Should fix #361 2015-06-22 13:01:42 -04:00
Arcaratus
62879c48cb Fix things 2015-06-22 12:57:41 -04:00
ljfa-ag
9ac6377993 Cache values of isBlockOre for Magnetism ritual 2015-06-21 15:32:13 +02:00
ljfa-ag
a85e1688cf Add toString to ItemType 2015-06-21 15:18:59 +02:00
Arcaratus
5e2a620a3b Small things 2015-06-14 10:33:01 -04:00
WayofTime
888b488fea Small changes 2015-06-13 18:06:23 -04:00
Arcaratus
cf5a445fbb Added in a Guide-API download command 2015-06-13 17:46:48 -04:00
Arcaratus
3efabb4e26 Added in an auto-magic downloader for Guide-API 2015-06-12 21:37:40 -04:00
Arcaratus
4f9acb223f Merge remote-tracking branch 'upstream/master' 2015-06-12 15:12:22 -04:00
Arcaratus
90b34056c1 Shtuff 2015-06-12 15:11:56 -04:00
Arcaratus
8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -04:00
ljfa-ag
321d489de0 Change ore block detection for Ritual of Magnetism
fixes #347
2015-06-10 20:20:19 +02:00
WayofTime
7d7db0b60f Upgraded to G-API v19 2015-06-04 17:07:23 -04:00
WayofTime
23106c7129 Finished the books~ 2015-05-27 16:31:47 -04:00
WayofTime
43538b6f69 Fixed +Arcaratus derp for one of the client events :D 2015-05-27 08:25:45 -04:00
WayofTime
8e8e314a48 Completed "The Demon Kin" and "The Battle Mage" 2015-05-26 11:47:42 -04:00
WayofTime
c02f8a9e5f Updated Guide-API 2015-05-25 15:21:59 -04:00
WayofTime
5c01df44c1 Delivering packages in style! 2015-05-25 14:58:23 -04:00
WayofTime
f553711573 Working on the Ritual Master (with images for rituals)
Added a multi-block page for rituals
2015-05-25 10:06:18 -04:00
WayofTime
39fb9ead81 Added the ability to configure the alchemy potions *shakes fist at +mDiyo * 2015-05-19 07:04:06 -04:00
WayofTime
96a5d93649 Merge pull request #331 from Arcaratus/master
Sigil of Holding remake!
2015-05-18 20:32:19 -04:00
WayofTime
55db2dd3ac A few last minute changes 2015-05-18 20:32:04 -04:00
Arcaratus
0f3c0196cd Sigil of Holding remake! 2015-05-18 18:33:23 -04:00
WayofTime
61cb569ffb Fixing the ritual diviner. 2015-05-11 21:46:51 -04:00