Commit graph

135 commits

Author SHA1 Message Date
WayofTime
9e2c0e6e74 Fixed non-armour and non-sigil items 2015-07-30 08:44:01 -04:00
WayofTime
94b74fe309 Randoms. 2015-07-29 18:15:25 -04:00
WayofTime
1fbebc56a2 Merge pull request #404 from Arcaratus/bloodmagic1.8
Did ModBlocks
2015-07-29 11:34:46 -04:00
Arcaratus
e5abfd03e5 Did ModBlocks 2015-07-29 11:30:24 -04:00
WayofTime
f046b07a82 Reworked more rituals, allowed Int3 to be created from BlockPos - note for future, may replace Int3 with Vec3i for future use 2015-07-29 11:25:11 -04:00
WayofTime
b090d154eb Doing more cleanup 2015-07-29 09:15:43 -04:00
WayofTime
c5681dc831 Initial commit of BM 1.8 2015-07-29 08:23:01 -04:00
WayofTime
647f81e624 Merge pull request #399 from Arcaratus/master
Added in #396 and sword blocking
2015-07-27 14:07:22 -04:00
Arcaratus
bc67bb8379 Added in #396 and gave the sword blocking 2015-07-27 14:02:32 -04:00
WayofTime
6470d91ff9 Fix #398, Fixed DemonPlacer so that it would spawn the demons with the owners. 2015-07-27 13:36:47 -04:00
WayofTime
19ed528d13 Experimentation with rendering the armour of the player. 2015-07-19 14:44:12 -04:00
WayofTime
bf068d1487 Fully fixed elementals. 2015-07-18 16:38:47 -04:00
Arcaratus
74f4e4f224 Refixed the Dismantler 2015-07-16 09:46:30 -04:00
Arcaratus
2557e02018 Fixed Ritual Dismantler 2015-07-16 09:29:21 -04:00
Arcaratus
0d9db7def1 Fix #381 2015-07-10 16:52:39 -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
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