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 |
|
|
Arcaratus
|
8d2ab7aa7a
|
Small stuff
|
2015-06-12 14:53:28 -04:00 |
|
|
WayofTime
|
6ef59dcb27
|
Merge pull request #348 from ljfa-ag/magnetism
Change ore block detection for Ritual of Magnetism
|
2015-06-10 16:00:00 -04:00 |
|
|
WayofTime
|
e9519662ba
|
Merge pull request #346 from NatsuArashi/patch-2
Update zh_TW.lang
|
2015-06-10 15:54:41 -04:00 |
|
|
ljfa-ag
|
321d489de0
|
Change ore block detection for Ritual of Magnetism
fixes #347
|
2015-06-10 20:20:19 +02:00 |
|
|
NatsuArashi
|
f8e272ca02
|
Update zh_TW.lang
STILL WORKING
|
2015-06-10 17:45:33 +08: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 |
|
|
WayofTime
|
4470eb3178
|
Merge pull request #328 from Arcaratus/master
Updated things, added in Unbinding recipes, etc.
|
2015-05-11 21:46:03 -04:00 |
|
|
Arcaratus
|
9642dc4d3f
|
Merge branch 'master' of https://github.com/Arcaratus/BloodMagic
|
2015-05-11 21:40:10 -04:00 |
|
|
Arcaratus
|
9247e66f13
|
Added in Unbinding Ritual recipes (UnbindingRegistry.registerRecipe(outputItemStack, inputItemStack)) and automatic reversion of registered Binding Recipes. Renamed Binding Ritual class, updated ritual blacklist. Blood Magic, now with 8% more lightning!
|
2015-05-11 21:38:16 -04:00 |
|
|
WayofTime
|
940c9e8219
|
Merge pull request #327 from Arcaratus/master
Fixed teleposers
|
2015-05-11 19:10:11 -04:00 |
|
|
Arcaratus
|
1eefcda6ca
|
Fixed teleposers
|
2015-05-11 19:08:06 -04:00 |
|
|
Arcaratus
|
307184fb85
|
Revert "Fixed Teleposers"
This reverts commit da9866ac8f.
|
2015-05-11 19:05:14 -04:00 |
|
|
Arcaratus
|
da9866ac8f
|
Fixed Teleposers
|
2015-05-11 19:04:37 -04:00 |
|
|
WayofTime
|
c36f752612
|
Readded the Blood Frame
|
2015-05-11 13:28:01 -04:00 |
|