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 |
|
WayofTime
|
2cc9d3a53a
|
Added the Forestry API
|
2015-05-11 13:12:56 -04:00 |
|
WayofTime
|
69aeb4a813
|
Merge pull request #319 from TehNut/master
Remove non-essential files from `../gradle/`
|
2015-05-06 07:14:17 -04:00 |
|
TehNut
|
ce30d4b3fc
|
Remove non-essential files from ../gradle/
|
2015-05-06 04:08:24 -07:00 |
|
WayofTime
|
a0b1514efb
|
Added a few more alchemy circles
|
2015-05-05 17:43:08 -04:00 |
|
WayofTime
|
cab4b6b7cb
|
Finished "The Architect," and added much fancier alchemy arrays to the water and lava rituals
|
2015-05-05 07:31:41 -04:00 |
|
WayofTime
|
f74e4993cf
|
Updated the books, worked more on the new self-sacrifice mechanics, allowed the teleposer to telepose entities across dimensions, changed the Focus of the Ellipsoid so that it now places blocks from a chest underneath the MRS.
|
2015-05-04 14:16:58 -04:00 |
|
WayofTime
|
c71edfb937
|
Added variable incense - issue with build needs to be resolved in build.gradle
|
2015-05-01 18:56:16 -04:00 |
|
WayofTime
|
f1ebade718
|
Working on an Incense mechanic... You'll find out!
|
2015-04-30 09:37:39 -04:00 |
|
Anton
|
47c9c8439d
|
Git why
|
2015-04-30 15:22:37 +03:00 |
|
Anton
|
0bec104bf6
|
Solve merge conflicts?
|
2015-04-30 15:18:55 +03:00 |
|
WayofTime
|
b90db3857b
|
Ritual diviner now auto-constructs rituals.
|
2015-04-29 17:39:06 -04:00 |
|
Anton
|
47e7cad9e9
|
Make some messages localized serverside
|
2015-04-26 13:50:55 +03:00 |
|
WayofTime
|
9329387b6c
|
Large amount of work on the book
|
2015-04-24 16:09:40 -04:00 |
|
WayofTime
|
45642e44bf
|
Implemented guide pages
|
2015-04-24 07:56:46 -04:00 |
|
WayofTime
|
53ba21055d
|
Actually fixed the VoidSigil ^_^
|
2015-04-24 07:47:30 -04:00 |
|
WayofTime
|
634bab7688
|
Fixed the Liquid Sigils so that they would work on tanks again.
|
2015-04-24 07:41:08 -04:00 |
|
WayofTime
|
110deaf0e6
|
Added the Guide-API in order to start work on books.
|
2015-04-23 18:26:50 -04:00 |
|
WayofTime
|
3e53489162
|
Small tweak to prevent a possible annoyance.
|
2015-04-21 16:32:42 -04:00 |
|