Commit graph

117 commits

Author SHA1 Message Date
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
5e2a620a3b Small things 2015-06-14 10:33:01 -04:00
Arcaratus
4f9acb223f Merge remote-tracking branch 'upstream/master' 2015-06-12 15:12:22 -04:00
Arcaratus
8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -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
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
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
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
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
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
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
bf14e3ebb1 Added stuffs 2015-04-19 12:23:27 -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
WayofTime
02c25f0bb0 1.3.2-1 2015-04-16 16:18:27 -04:00
ljfa-ag
2e5ec19c7d Fix phantom bridge blocks being one block too high on the client
Fixes #301
2015-04-16 17:04:06 +02:00
WayofTime
3d89bd6b90 Added an auto-crafting ritual
Fixed Blood Light sigil glitches
Fixed some issues with the Reagent HP bar not draining correctly - what was I thinking?!?
2015-04-16 09:02:19 -04:00
WayofTime
f2b4f3db9e Added WoS reagent use, general touch ups. 2015-04-13 13:10:10 -04:00
WayofTime
efa5d89539 Added several environmental-based abilities to the Wind and Fire armours. Tweaked the base armour penetration protection on the Omega armour to be a bit more balanced. Made the extra HP bar more fancy! :) 2015-04-12 10:59:41 -04:00
WayofTime
6dd95c23fa Added the final recipes required. Also added the Ritual Diviner that can place Dawn stones 2015-04-11 17:56:42 -04:00
WayofTime
b725f7b814 Added the method to create the Omega armours, though it wasn't a secret for a while! :D
Added the ability to enchant omega armour in such a way that there won't be a single best method
A bunch of other stuff I can't remember. Fun times!
2015-04-11 15:43:06 -04:00
ljfa-ag
a17de943c4 Fix client-side ghost items 2015-04-10 20:32:09 +02:00
ljfa-ag
1887df3d1e Apply to shovel and axe as well 2015-04-10 20:30:52 +02:00
ljfa-ag
d800e06cb8 Refactor bound pickaxe item dropping 2015-04-10 15:53:33 +02:00
WayofTime
ab0c49f8c7 General toying with the enchantments for the Omega armour, tweaked the ritual diviner's functionality, fixed teleposers not teleposing players in certain circumstances. 2015-04-08 09:52:51 -04:00
WayofTime
bab6e576d2 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-04-04 16:45:55 -04:00
WayofTime
ab8d25db76 Added the Dawn Scribing Tool + Dawn Ritual Stone
Fixed the ISidedInventory nature of the chemistry set
Added the Omega Reaction Chamber for initiating the Omega state
Experimented with enchantments
2015-04-04 16:35:42 -04:00
Arcaratus
0b7d4442ee Update CreativeDagger.java 2015-03-23 17:48:41 -04:00
Arcaratus
f0b5353742 Update it to fill IBloodAltar 2015-03-22 11:49:28 -04:00
WayofTime
60ae47c499 Fixed Ghast Tear simple spell. The issue was "!" funny! 2015-03-21 10:10:25 -04:00
WayofTime
18d07baad3 More base-work on Omega 2015-03-19 15:26:03 -04:00
WayofTime
d7d8aedd42 Fixed Harvest sigil in armour giving bad items
Finished optimization of compression handler.
2015-03-11 19:19:17 -04:00
WayofTime
5fdad1dc0d Merge pull request #263 from hilburn/master
Dagger of sacrifice cleanup
2015-02-27 16:38:29 -05:00
hilburn
e01a1f8937 Dagger of sacrifice cleanup
Wither and Dragon are instanceof IBossDisplayData
isChild is already checked
Generally stripped repeated code
2015-02-27 21:33:44 +00:00
WayofTime
3b7e58215b Last commit of mine before I update 2015-02-27 16:31:08 -05:00
WayofTime
39e3d6eb34 Added a crafting cooldown on IAltar, so that outside blocks may request the altar to not perform work while it is not active. 2015-02-27 08:31:39 -05:00
WayofTime
8fbb19acc0 Fully optimized the compression handler~ 2015-02-26 17:32:53 -05:00