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
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
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
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
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
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
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
34f779563e
Added an AgriCraft Harvest Handler for their crops (uses reflection, so will be pulled as soon as the official one is made on their side)
...
Added the checks required for Strength to affect the damage of the Tool Paradigms.
2015-04-21 12:33:20 -04:00
WayofTime
201c70a766
Merge pull request #308 from Arcaratus/master
...
Updated things
2015-04-19 22:27:21 -04:00
WayofTime
7747d2221a
Made stuff transparent
2015-04-19 22:24:30 -04:00
Arcaratus
c2c2b1693e
Update DaggerOfSacrifice.java
2015-04-19 14:53:46 -04:00
Arcaratus
bc23585ab2
Update DaggerOfSacrifice.java
2015-04-19 14:53:14 -04:00
Arcaratus
5aaa863b61
Update AchievementsRegistry.java
2015-04-19 12:42:29 -04:00
WayofTime
6f182805aa
Merge pull request #306 from Arcaratus/master
...
Added things
2015-04-19 12:40:27 -04:00
Arcaratus
bf14e3ebb1
Added stuffs
2015-04-19 12:23:27 -04:00
WayofTime
89d723b3ee
Work on a new ritual
2015-04-19 12:02:49 -04:00
Arcaratus
72b1904f6b
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
2015-04-18 20:38:20 -04:00
Arcaratus
31f552fe2d
Random stuffs
...
Updated commands
Added in a ritual hologram --Alex's code
Added a Total Stones tooltip to the ritual diviner
Gave the Alchemy Relay a null bounding box
Added localizations to the blocks that didn't have any
2015-04-18 19:49:09 -04:00
WayofTime
e99f545694
Merge pull request #302 from ljfa-ag/phantom-bridge
...
Fix phantom bridge blocks being one block too high on the client
2015-04-18 17:11:29 -04:00
