WayofTime
|
bf068d1487
|
Fully fixed elementals.
|
2015-07-18 16:38:47 -04:00 |
|
|
WayofTime
|
07973fb674
|
Merge pull request #390 from Arcaratus/master
Fixed Elemental Crash
|
2015-07-18 10:18:02 -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
|
375bfe4842
|
What were you doing here?
|
2015-07-17 12:57:07 -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 |
|
|
WayofTime
|
6bdcfc4f46
|
Merge pull request #384 from Arcaratus/master
Add achievements
|
2015-07-13 15:04:33 -04:00 |
|
|
Arcaratus
|
2d6b1c4462
|
Add achievements
|
2015-07-13 14:25:10 -04:00 |
|
|
WayofTime
|
976df4e0e5
|
Merge pull request #382 from Arcaratus/master
Fix #381
|
2015-07-10 16:55:16 -04:00 |
|
|
Arcaratus
|
a3903de11b
|
Merge branch 'master' of https://github.com/Arcaratus/BloodMagic
|
2015-07-10 16:52:56 -04:00 |
|
|
Arcaratus
|
0d9db7def1
|
Fix #381
|
2015-07-10 16:52:39 -04:00 |
|
|
Arcaratus
|
f87cf547ac
|
Fix #381
|
2015-07-10 16:51:00 -04:00 |
|
|
WayofTime
|
8632aeb253
|
Merge pull request #379 from Arcaratus/master
Fix #373 and did #375
|
2015-07-09 11:30:50 -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 |
|
|
WayofTime
|
1280f4e0ae
|
Merge pull request #372 from Arcaratus/master
Fix #370, #367
|
2015-07-06 18:55:55 -04:00 |
|
|
Arcaratus
|
3328c4db74
|
Fix #370, #367
|
2015-07-06 18:50:15 -04:00 |
|
|
WayofTime
|
b75c0f5852
|
Merge pull request #369 from Arcaratus/master
Performance Commit
|
2015-07-02 11:19:37 -04:00 |
|
|
Arcaratus
|
e5b795fddc
|
Performance Commit --Too lazy to do the Altar recipe
|
2015-07-02 11:05:07 -04:00 |
|
|
WayofTime
|
013367cffa
|
Merge pull request #354 from Arcaratus/master
Things
|
2015-06-22 14:15:46 -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 |
|
|
WayofTime
|
234ba2bc1d
|
Merge pull request #362 from Samernieve/patch-1
Update es_ES.lang
|
2015-06-21 13:27:11 -04:00 |
|
|
WayofTime
|
9686c6f8b5
|
Merge pull request #359 from ljfa-ag/magnetism
Cache values of isBlockOre for Ritual of Magnetism
|
2015-06-21 13:26:57 -04:00 |
|
|
Samernieve
|
afee68be27
|
Update es_ES.lang
Added the full translation into Spanish.
|
2015-06-21 18:49:55 +02: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 |
|
|
WayofTime
|
7b0f3f6e3c
|
Fixed the build properties.
|
2015-06-19 07:05:51 -04:00 |
|
|
Arcaratus
|
a6c61c6dff
|
no message
|
2015-06-14 10:34:24 -04:00 |
|
|
Arcaratus
|
5e2a620a3b
|
Small things
|
2015-06-14 10:33:01 -04:00 |
|
|
Arcaratus
|
41b42c9447
|
Kommit
|
2015-06-13 19:00:56 -04:00 |
|
|
Arcaratus
|
193e5fe943
|
Check if Tehnut's lying....
|
2015-06-13 18:35:48 -04:00 |
|
|
WayofTime
|
888b488fea
|
Small changes
|
2015-06-13 18:06:23 -04:00 |
|
|
WayofTime
|
ff8cf59bb8
|
Merge pull request #351 from Arcaratus/master
Added useful things
|
2015-06-13 18:03:49 -04:00 |
|
|
Arcaratus
|
cf5a445fbb
|
Added in a Guide-API download command
|
2015-06-13 17:46:48 -04:00 |
|
|
Arcaratus
|
4a32683322
|
Update .lang
|
2015-06-12 21:42:38 -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 |
|