lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2483 commits 12 branches 0 tags 44 MiB
Commit graph

2110 commits

Author SHA1 Message Date
Nicholas Ignoffo
68ca7cf9a5 Fix Grave Digger not applying damage bonus (#1098) 2017-03-13 16:14:07 -07:00
A_D
35ceb9d21e fixed inconsistent altar tier readout with seer's sigil (#1094) 
(cherry picked from commit 2b92151)
 2017-03-13 16:04:36 -07:00
Nicholas Ignoffo
0208d5412c Fix crash when meteor hits (#1088) 2017-03-11 16:09:57 -08:00
Nicholas Ignoffo
9cea8e8b73 Fix dupe with Crash of the Timberman (#1090) 
Also took the time to add IItemHandler support
 2017-03-11 16:01:00 -08:00
Nicholas Ignoffo
c4f04b1589 Fix another null check crash (#1091) 2017-03-11 15:53:43 -08:00
Nicholas Ignoffo
7c8e9b6d8d Move some of the ritual chat lines to action bar 2017-03-08 18:00:36 -08:00
majikguy
b4603a4b9a Entity Registration Fix (#1087) 
* Replaced the Entity registration code. Before, the code was manually adding entities to the GameRegistry.

Doing this prevents the engine from fully registering the added entities in all the proper places. The result was that the Client was never informed of when these entities were created or what they were doing, as all of that behavior is managed by the EntityRegistry.

Changing to the proper EntityRegistry calls fixes issue #1065.

* Changed ResourceLocation calls to the one with two arguments. Didn't know that was a thing before. :D

Also added more consistent whitespace.
 2017-03-07 16:17:18 -08:00
Nicholas Ignoffo
85a16ac075 Should fix Blood Light being collidable (#1083) 
Why did this only occur in obfuscated environments?
 2017-03-06 16:18:55 -08:00
Nicholas Ignoffo
333ad6a09e Fix null stacks in Utils class 2017-03-06 16:09:11 -08:00
Nicholas Ignoffo
fceb50bd00 Initialize default altar result as empty stack (#1086) 2017-03-06 16:05:52 -08:00
Nicholas Ignoffo
52861ef7c2 Fix Cutting Fluid returning null when it empties (#1082) 2017-03-05 10:44:55 -08:00
Nicholas Ignoffo
3a707df23c Fix inability to remove gem from crucible (#1079) 2017-03-05 10:38:23 -08:00
Nicholas Ignoffo
f083e4e036 Fix Sigil of Holding (#1081) 2017-03-05 10:28:06 -08:00
Nicholas Ignoffo
4e5bc46e21 Fix JEI not displaying armor tomes 2017-03-03 17:21:36 -08:00
majikguy
58db36033a Fixed a typo that made stage 4 of the Body Builder upgrade 5x as difficult as stage 5. (#1080) 
(cherry picked from commit 9540df7)
 2017-03-03 16:57:26 -08:00
Nicholas Ignoffo
fd54ab0458 Fix tartaric gem returning null (#1068) 2017-03-03 16:45:53 -08:00
neconeco2
b1670cdbd5 Update ja_JP.lang (#1076) 
(cherry picked from commit 22354ea)
 2017-03-02 20:37:32 -08:00
Nicholas Ignoffo
203a2f5fc7 Fix off by 1 letter in inventory serialization (#1072) 2017-03-02 17:36:28 -08:00
Nicholas Ignoffo
f3d980ee89 Rewrite Hymn of Syphoning for caps 
Needs testing and needs to be optimized.

(cherry picked from commit 3f24e46)
 2017-03-02 17:01:23 -08:00
Nicholas Ignoffo
3cbfb0a40f Sort rituals by component count to avoid conflicts (#1070) 
Large rituals can now use, for example, the Serenade of the Nether layout if wanted.

(cherry picked from commit 0b93c11)
 2017-03-02 16:59:08 -08:00
Nicholas Ignoffo
4e7f0d12f9 Fix Alchemy Table JEI compat being fundamentally wrong (#1069) 
(cherry picked from commit fedea85)
 2017-03-02 16:57:51 -08:00
Nicholas Ignoffo
8360041da2 Child mobs are now viable for sacrifice at half the rate 
(cherry picked from commit 719cff0)
 2017-03-02 16:53:29 -08:00
Nicholas Ignoffo
6ac31ba1e8 Dagger of Sacrifice should not work for FakePlayers 
(cherry picked from commit c4f9270)
 2017-03-02 16:52:53 -08:00
Nicholas Ignoffo
45faf42167 Fix OBO when getting blood tank capacity (#1066) 2017-02-25 14:07:11 -08:00
Nicholas Ignoffo
40bac68190 Break early if activation crystal isn't bound 
Fixes annoying and usually false "not configured correctly" message.

https://redd.it/5vte95

(cherry picked from commit 32668f7)
 2017-02-23 20:03:26 -08:00
Nicholas Ignoffo
72bf53f8d3 Fix crash when teleposing Demon Will Crystals (#1062) 
(cherry picked from commit 970acd4)
 2017-02-23 19:47:01 -08:00
Nicholas Ignoffo
88efd672d5 Fix crash when using newly created toggle sigils (#1059) 
(cherry picked from commit b55b453)
 2017-02-22 16:28:57 -08:00
Nicholas Ignoffo
0927fa16f6 Special case RAW will when converting enums 
(cherry picked from commit e8f0194)
 2017-02-22 16:27:44 -08:00
Nicholas Ignoffo
91aeb4bf48 Update version + changelog 2017-02-21 16:52:39 -08:00
Nicholas Ignoffo
a7a6b1fddc Fix oddity with comparators on Altars (#1058) 
*shakes fist at @Arcaratus*

(cherry picked from commit 461c476)
 2017-02-21 16:13:23 -08:00
Nicholas Ignoffo
da1bb01ff0 Return past functionality to canCombine 2017-02-20 14:15:41 -08:00
Nicholas Ignoffo
93d7efcb40 Fix crash when creating a tank stack with meta > 15 (#1057) 
Also finally fixes the tanks so they properly drop themselves.
 2017-02-20 13:47:36 -08:00
Nicholas Ignoffo
58d11dfbdc Fix Sigil of Holding crash when opening gui (#1056) 2017-02-20 13:13:15 -08:00
Nicholas Ignoffo
5475549c18 More null stack fixes 2017-02-19 16:06:29 -08:00
Nicholas Ignoffo
72c321acb0 Implement an inverted MRS that requires an RS signal to function (#1022) 
(cherry picked from commit ddb7542)
 2017-02-19 14:41:06 -08:00
Nicholas Ignoffo
64bc427c1c Missed a couple files 
(cherry picked from commit f0e3aa6)
 2017-02-19 14:38:28 -08:00
Nicholas Ignoffo
49b8c40e6a More proper fix for #1019 
(cherry picked from commit 2ee2cc5)
 2017-02-19 14:38:02 -08:00
Nicholas Ignoffo
cdb5127598 Fix ore doubling potentially adding invalid recipes (#1051) 
(cherry picked from commit 9027f76)
 2017-02-19 14:34:19 -08:00
Nicholas Ignoffo
8259676d1b Downgrade tomes are now know that they're downgrades 
Also Disoriented is localized finally

(cherry picked from commit e092161)
 2017-02-19 14:33:56 -08:00
neconeco2
61bf9c1b08 Update ja_JP.lang (MC1.11) (#1050) 2017-02-13 12:12:45 -08:00
Nicholas Ignoffo
c13be9ebce Cache the bound SoulNetwork for rituals 
Avoids looking up the map data once or more each tick
 2017-02-12 17:00:18 -08:00
Nicholas Ignoffo
b0d35577a9 Fix server crash when adding categories to book (#1046) 2017-02-12 16:11:55 -08:00
Nicholas Ignoffo
1728ba7b83 Migrate alchemy table blocking to a boolean array 2017-02-12 11:09:39 -08:00
Nicholas Ignoffo
2db775346c Fix crash when unblocking slot in alchemy table 
why way why

`boolean[] blocked = new boolean[slotCount]` :I
 2017-02-12 01:59:30 -08:00
Nicholas Ignoffo
ac5cf52151 Fix some model errors 2017-02-12 01:39:19 -08:00
Nicholas Ignoffo
7f50780d2f Fix modid references in API javadoc 2017-02-12 01:36:01 -08:00
Nicholas Ignoffo
f135dab7ba IMC API for adding new altar components (#1039) 
CC @Drullkus

(cherry picked from commit 8a8bff8)
 2017-02-12 01:34:51 -08:00
pksiazek
9010cebc40 #1036 Fixed Living Armor sacrifical upgrade (#1037) 
(cherry picked from commit 6802bc5)
 2017-02-12 01:34:34 -08:00
Nicholas Ignoffo
d0e9174446 Bound tools should drain LP (#1033) 
(cherry picked from commit 59920ef)
 2017-02-12 01:34:20 -08:00
Nicholas Ignoffo
86ea69eaca Temporarily remove item rendering for tank fluid 
You cannot bake GL stuff. This is bad. Also it got broken at one point.

I'll re-add this once I remove the need for a TESR.

(cherry picked from commit 13228f6)
 2017-02-12 01:33:48 -08:00