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

2135 commits

Author SHA1 Message Date
KohaiKhaos ebfd8ce9a3 Several mimic fixes, with actually cleaned up commit history. (#1379) 
* Reimplemented a lot of mimic logic and did a first run of changing how mimics store their states.

* Finished removing all metadata calls for blocks replaced by mimics.

* Update EntityMimic.java

* Update ItemBlockMimic.java

* Update TileMimic.java

* How did I even replace a semicolon with a slash.

* Changed all tabs to 4 spaces. Changed Serializer to StateUtil

* Fixed spacing again, hopefully for the last time
 2018-08-07 16:28:55 -07:00
KohaiKhaos 7954d04421 Fixed a null pointer exception with certain modded blocks with the Ritual of Magnetism (#1380) 
* Replaced a null RayTraceResult in Magnetism Ritual with a real one

* Added a fake player to the code. No more passing nulls.
 2018-08-07 16:24:41 -07:00
AEon - Tobias e8ad057662 Added RitualReader/Ritual Tinkerer to creative tab (#1393) 2018-08-07 16:02:22 -07:00
AEon - Tobias ce46de0d0a Fixed Crystal Cluster behavior. (#1390) 
* Players in creative mode can now add crystals to crystal blocks by right clicking them with an item demon crystal.
Crystal block texture now updates on the next tick. The render update is only called when a new crystal has been added (by natural or unnatural means).
Adding a crystal imitates a positive result of checkAndGrowCrystal()

closes #1151

* fixed conditional to allow harvesting crystals if not in creative and holding crystal
 2018-08-07 15:59:09 -07:00
Urey. Xue daa52f4d3d Corrections of manual translation (#1386) 
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix

* Correct some misintepretations
 2018-08-07 15:52:11 -07:00
AEon - Tobias d30dcf1ae5 Sentient Sword to not attack players unless provoked/auto attack mobs (#1381) 
* Should close #1121

Not tested (yet) (because I haven't figured out how to launch the server with a fake player entity... yet).

* will close #1121

Tested.

Specters only attack players if they attack the owner or the specter.
Spectres now autoattack every instance of EntityMob in range.

//TODO: (fluff) make Bow Specter change angle based on target position (it currently always looks like it shoots into the ground)
 2018-08-07 15:48:01 -07:00
Arcaratus b441e7fc1e SoulTicket internal implementation (#1372) 
* Fix the Blood Tank BB

* Add modid to command localizations to prevent conflicts

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
Corrected localizations of other lang files

* SoulTicket internal implementation

* do what TehNut says

* implement hashCode()

* Fix toggleable sigils draining on r-click when it shouldn't
Also moved the ItemSigil and ItemSigilToggleable to the sigil package (why wasn't it there???)
 2018-08-07 15:27:12 -07:00
Nicholas Ignoffo 093cfb13ef Changelog + version 2018-07-22 07:10:00 -07:00
Arcaratus 6c5bbed348 Quick Fixes (#1362) 
* Add modid to command localizations to prevent conflicts

* Corrected localizations of other lang files

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
 2018-07-22 07:07:27 -07:00
Nicholas Ignoffo e82510d553 Fix will type serializer using lowercased names for lookups (#1369) 2018-07-22 06:56:10 -07:00
KohaiKhaos 5ac52fa8c9 Mob Sacrifice Array no longer kills bosses or players (#1371) 
This is solving the issue I raised in https://github.com/WayofTime/BloodMagic/issues/1368
Added a single check to line 123 of src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java.
The check makes sure the effective health of the currently targeted entity is above 0. So bosses and players are no longer set to -1 health when the array finishes crafting.
 2018-07-22 06:54:46 -07:00
Nicholas Ignoffo 7aadc505ab Fix Ritual of Magnetism not being registered 2018-07-22 06:51:38 -07:00
Nicholas Ignoffo fb90656335 Green Grove ritual should apply to Reeds and Cactus (#1359) 2018-07-16 16:42:10 -07:00
Nicholas Ignoffo a7fcfbd2d0 Laputa Array should not be able to move unbreakable blocks (#1360) 2018-07-16 16:05:13 -07:00
Nicholas Ignoffo 42c69eb557 Rework of ritual registration 
Moves to annotation based registration. Configs are handled for automatically
 2018-06-28 21:56:25 -07:00
Nicholas Ignoffo e3d65a9e3a Rework of HUD element system 
Allows configuration because that's probably a good thing. The values in
the json config are percentages of the screen.
 2018-06-28 20:37:53 -07:00
Nicholas Ignoffo 47b88b95b0 Base work for ticket based syphoning 
To be used for providing a history. This commit breaks any usage of the
network events.

Heads up @TeamDMan @Arcaratus
 2018-06-28 18:24:17 -07:00
Nicholas Ignoffo c8e42e3288 Fix lava crystal not syphoning LP (#1326) 2018-06-26 17:15:45 -07:00
Nicholas Ignoffo 22e8290921 Teleposition Sigil should make sure a Teleposer is the destination (#1328) 2018-06-26 17:09:18 -07:00
Nicholas Ignoffo 86f54886c5 Mending should not work on potion flasks (#1332) 2018-06-26 16:53:16 -07:00
Nicholas Ignoffo d1e77acc73 Bandaid crushing ritual to pass a valid player instance (#1345) 
This entire thing needs to be cleaned up. It's so bad right now :(
 2018-06-26 16:50:34 -07:00
Nicholas Ignoffo 954f2c87e1 Fix bound orbs not allowing JEI interactions (#1349) 2018-06-26 16:42:35 -07:00
Nicholas Ignoffo b38c3022ee Fix crafted inscription tools not having the proper durability (#1353) 2018-06-26 16:32:07 -07:00
Arcaratus 1096c697f4 Fix the Blood Tank BB (#1347) 2018-06-20 18:43:33 -07:00
Urey. Xue 8bec2f3872 Update zh_CN.lang of blood magic guide (#1327) 
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix
 2018-06-12 21:49:24 -07:00
PiscesdanAT 7263e6fbc2 Update de_DE.lang (#1337) 
Someone mixed up dusk and dawn
 2018-06-09 09:01:30 -07:00
WayofTime edf4564a07 Fancied up the rendering of the Mob Sacrifice array, as well as added more behaviour 2018-05-15 12:40:00 -04:00
Nicholas Ignoffo f563da152e Fix Teleposer swapping blocks even if the event is cancelled (#1303) 2018-05-13 22:20:33 -07:00
WayofTime 389043dc64 Implemented the Mob Sacrifice Array. 
Needs some cleaning up + added visuals, but appears functional.
 2018-05-07 22:10:59 -04:00
WayofTime 32227afd9d Fixed Syntax error in the recipes, as well as annoyed Nut with another class with bracing changes. 
(Wonder when I should change all the classes...)
 2018-05-05 15:20:37 -04:00
Vegar Guldal c94af26a64 Require water potion instead of uncraftable potion (#1297) 
Fixes issue where cutting fluid is uncraftable.
 2018-05-04 13:58:39 -07:00
WayofTime 6a56a13aac Final push before 2.2.12. 2018-05-04 14:34:46 -04:00
cpw 778838e2b0 Fix light calculation to use actual visible level. Should now work on (#1295) 
surface at night as well as underground. Tweak duration to reduce
flicker.
 2018-05-03 19:26:28 -07:00
WayofTime 383be360ff Improved collision "i.e. actually made a non-retarded position update" for the Scroll of Icarus. 2018-05-01 21:39:15 -04:00
WayofTime 3f8a455b90 Made some WIP additions to the Scroll of Icarus, allowing it to pick up mobs. Lacks costs and may break. 2018-05-01 16:29:19 -04:00
WayofTime 920d105374 Needed to be more pushy. 2018-05-01 06:51:37 -04:00
Nicholas Ignoffo 29ae24b044 Fix altar double counting upgrades (#1291) 2018-04-30 19:01:54 -07:00
WayofTime d29b91a106 Fixed the Fluid filters so that they now work perfectly in the routing system. 2018-04-29 09:57:29 -04:00
WayofTime b20e1ac4d7 Fixed Cutting Fluids so they now work properly. 2018-04-29 08:40:42 -04:00
WayofTime 7cecdef6c5 Fixed the Hellfire Forge and Alchemy Table so that they now accept ingredients in any order. 2018-04-29 07:39:20 -04:00
WayofTime eb6b8a3aa5 Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. 2018-04-28 21:56:57 -04:00
Nicholas Ignoffo 560d167765 Check the proper maps when looking up fluid priorities (#1286) 
When copypasta goes wrong.
 2018-04-26 19:12:14 -07:00
WayofTime 842c9d1411 Fixed the Alchemy Array from voiding items when broken when it shouldn't have. 2018-04-26 16:33:22 -04:00
Nicholas Ignoffo 151c1dfd67 "way pls" - TehNut 2018 (#1279) 2018-04-24 17:08:08 -07:00
Nicholas Ignoffo da8e43a8b4 Fix Blood Tank NBT transfer between item/tile form (#1283) 2018-04-24 17:06:43 -07:00
WayofTime 6522b0fa1b Fixed the Blood Altar so it can actually fill Blood Orbs (derp). 2018-04-22 20:59:29 -04:00
WayofTime f4aef16ed1 Fixed the Turret Array. 
(Deja vu)
 2018-04-22 16:14:36 -04:00
WayofTime 37f9ea2ab2 Fixed server-sided crash for the turret array (why is Vec2f not found on the server???) 2018-04-22 16:04:08 -04:00
Nicholas Ignoffo afcf1a1822 Add a recipe for the fluid filter 2018-04-21 16:53:19 -07:00
Nicholas Ignoffo ddf07acf70 "way pls" - WayofTime 2018 2018-04-21 16:42:22 -07:00
WayofTime c9319477bd Made the Blood Altar check if it had a null recipe on update while active. (Actual change on line 271) 
Potential fix for #1275.
 2018-04-20 16:11:05 -04:00
WayofTime 60c8441115 Added the "Resonance of the Faceted Crystal" 2018-04-20 13:39:05 -04:00
Nicholas Ignoffo 7e2dc3f4e7 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-17 16:16:14 -07:00
Nicholas Ignoffo 19cdfbfb0a This file slipped through the craks :think: 2018-04-17 16:16:03 -07:00
WayofTime 07ae96a60e Fixed Demon Crystals growing at an accelerated rate (all the time). 2018-04-17 19:12:29 -04:00
Nicholas Ignoffo 79ccd1f3bb Add inputs to crafting events + implement SF/AT events (#1270) 2018-04-15 11:21:14 -07:00
Nicholas Ignoffo 2d83e8047d Fix Blood Light not being punchable (#1272) 
Also makes it more visible while holding the sigil.
 2018-04-15 11:05:02 -07:00
WayofTime af3e1fecb6 Fixed an interaction issue between vanilla hoppers and the Alchemy Table, due to the hoppers not actually using the Forge capabilities for all of its checking methods. 2018-04-13 16:44:00 -04:00
WayofTime 2db0ce5639 Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. 2018-04-13 12:20:39 -04:00
WayofTime ebdc66d063 Changed the Alchemy Table to use Bindable for checking the Orb's stored LP. Also fixed a crafting exploit with the table. #1269 2018-04-13 11:31:52 -04:00
Nicholas Ignoffo b63c383747 Fix Sanguine Scientium recipe (#1267) 2018-04-11 16:46:09 -07:00
Nicholas Ignoffo e64e481a11 Fix errant MRS tags displaying on fresh MRSs (#1265) 
I literally totally hate everybody who downvoted my comment in that issue
and will show them my wrath.
 2018-04-08 12:55:23 -07:00
WayofTime 9c2621e93a Fixed stupid NPE in the Furnace Array 2018-04-07 18:51:21 -04:00
Nicholas Ignoffo 6944e5e8d4 Add missing demon pylon itemblock (#1259) 2018-04-07 13:08:28 -07:00
Nicholas Ignoffo c8b394bf86 Add missing itemblock for demon crystals (#1252) 
Still need to figure out the rendering issue. Might just need to rewrite
them to store the age as meta instead of the type.
 2018-04-07 13:05:32 -07:00
Nicholas Ignoffo 234ccd4935 Fixed a null stack check in holding GUI 2018-04-07 12:47:46 -07:00
Nicholas Ignoffo 03a2904bd1 Fixed holding sigil internal interactions 
It will no longer tick unbound sigils and checks binding of stored sigil
on right click..
 2018-04-07 12:24:28 -07:00
Nicholas Ignoffo bf18c337e2 Fix of by one with altar upgrade calculation 2018-04-01 15:37:55 -07:00
Nicholas Ignoffo a5a9224f6d Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-01 15:37:07 -07:00
WayofTime 467bcb4d52 Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. 
Also added the guide page for the Shard of Laputa.
 2018-03-30 19:42:11 -04:00
WayofTime 58ca46b6bd Disabled the added Health in the "Quick Feet" upgrade. 2018-03-30 18:03:31 -04:00
WayofTime fff793ea7d Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. 
Also added better looking potion effects for a few things
Enabled Shard of Laputa array - no book entry yet.
 2018-03-30 18:01:23 -04:00
WayofTime d2a84c0e7c Added in the Spike Array 2018-03-30 11:35:40 -04:00
WayofTime b7adad76e7 Added in book entries for the Teleport Array and the Turret Array. 2018-03-30 07:15:38 -04:00
WayofTime 6e7b387e6a Added additional effects to the Sentient Bow when aspected to different Will types. 2018-03-29 16:05:56 -04:00
Nicholas Ignoffo 8dce592787 Fix out of bounds on invalid enum items 2018-03-23 17:12:32 -07:00
Nicholas Ignoffo 58d9678c40 Switch some more instances of chat spam to the action bar 2018-03-23 16:50:17 -07:00
Nicholas Ignoffo 7ec27febc6 Apply same model to all alchemic vials 2018-03-23 16:42:18 -07:00
Nicholas Ignoffo cdfc77be03 Cleanup ritual events (#1256) 
Also actually fire the imperfect one ¬_¬
 2018-03-23 16:18:16 -07:00
WayofTime 25f492ef65 *Hopefully* make Nut cry a bit less. 2018-03-23 13:24:33 -04:00
WayofTime dd6b5bd3b5 Added an example item whose variants use the same textures but different colours for the layers. 2018-03-23 11:02:43 -04:00
Nicholas Ignoffo f535e331dd Removed all usages of PleaseStopUsingMe 2018-03-17 22:30:14 -07:00
Nicholas Ignoffo 77e5beb9e1 Fully remove old LogHelper usage 2018-03-17 17:18:20 -07:00
Nicholas Ignoffo 924dc7b38d Fix server crash when handling dye recipes (#1250) 2018-03-13 23:10:13 -07:00
Nicholas Ignoffo 46389368ec Fix default potion flask recipe 2018-03-12 16:20:32 -07:00
Nicholas Ignoffo c7af09a458 Fixed Master Blood Orb cost (#1248) 
This has been wrong for almost 2 years now. Neat.
 2018-03-11 12:48:49 -07:00
WayofTime bbe026dda9 Added a new (slightly WIP?) array, the Turret Array 2018-03-11 11:19:34 -04:00
Nicholas Ignoffo ecb81a7017 A bit more altar cleanup 2018-03-10 00:07:19 -08:00
Nicholas Ignoffo eada60f436 Some altar cleanup and renaming 2018-03-09 18:00:04 -08:00
Nicholas Ignoffo fefeaf26af Holding sigil can provide it's own mesh provider now 2018-03-07 19:55:32 -08:00
Nicholas Ignoffo 554993ea79 Cleanup model registration 2018-03-07 19:43:00 -08:00
WayofTime c4527d157f Worked on the Laputa array. Yes, I went there. 2018-03-07 19:58:59 -05:00
qianzha c079da7969 Update zh_CN.lang (#1240) 
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_TW.lang
 2018-03-07 16:12:52 -08:00
Nicholas Ignoffo b011623333 Switch ritual component gathering to a Consumer rather than direct list access 2018-03-05 00:10:30 -08:00
WayofTime 3a83b4ca8a Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. 2018-03-04 19:11:46 -05:00
Nicholas Ignoffo 2b86e5c8ad More removal of BlockStack usages 2018-03-04 10:47:15 -08:00
Nicholas Ignoffo 8a61741e0d Rewrite Transposition Sigil 2018-03-04 10:15:03 -08:00
Nicholas Ignoffo 3f5178dd6a A bit of Ritual cleanup 
Slowly getting rid of these BlockStack references. Slowly moving towards
a proper "API" in our internals.
 2018-03-04 09:17:24 -08:00
WayofTime 986852e265 Added the ability to set the array to no longer drop its ingredients. 
- I need to just change all of the files to my format, so Nut doesn't cry each push.
 2018-03-04 09:36:03 -05:00
WayofTime e2f7772e82 Improved the Ellipsoid effect. 2018-03-04 09:29:19 -05:00
Nicholas Ignoffo 81ad9bf764 Cleaner fuel handling 2018-03-03 19:17:06 -08:00
Nicholas Ignoffo 927fc6498f Cleanup harvest handling 2018-03-03 19:16:53 -08:00
WayofTime 7a02783e31 Changed the recipe of the Teleport array. 2018-03-02 15:29:45 -05:00
WayofTime 08031e65f8 Fixed client-sided crash in the Blood Light sigil by rearranging a few arguments. 2018-03-02 15:21:51 -05:00
Nicholas Ignoffo 4a709157b8 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-02 11:52:32 -08:00
WayofTime 022fe00847 Worked on the Ellipsoid Ritual (currently disabled). No, it is not used to summon mathematical demons. 2018-03-02 14:46:59 -05:00
Nicholas Ignoffo f025407014 Move fuel handling to new event 2018-03-01 19:40:37 -08:00
Nicholas Ignoffo 70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08:00
Nicholas Ignoffo 0dd0854bd9 Move all SysOut references to debug logging 2018-03-01 18:23:56 -08:00
Nicholas Ignoffo 91d7f23b4f Add API method for registering recipes at proper time 
The old access to IBloodMagicRecipeRegistrar still exists, but should not
be used so mods like CraftTweaker can do their thing.

This commit also introduces @BloodMagicPlugin.Inject which will inject the
active API instance into an annotated field with the API interface as it's
type. These fields are populated during pre init.
 2018-02-28 17:53:23 -08:00
Nicholas Ignoffo 395f1188e7 Put fast miner array back up at Haste 3 
It was ~~our~~ my fault.
 2018-02-27 18:19:41 -08:00
WayofTime d783c1419b Merge branch '1.12' of https://github.com/wayoftime/bloodmagic into 1.12 2018-02-27 21:18:07 -05:00
WayofTime f4b72bed8b Added temp recipe to try out a new Teleport array. Don't stick only your hand in it, though. 2018-02-27 21:17:31 -05:00
Nicholas Ignoffo caab4dcbef Fix rituals crashing when deserializing the owner 2018-02-27 18:17:30 -08:00
Nicholas Ignoffo eaf4bfb857 Fix Haste being... *constricted* when above level 2 (#1239) 2018-02-27 18:17:03 -08:00
Nicholas Ignoffo 2a43e53842 Rewrite IBindable to provide an object instead of storing 2 strings 2018-02-27 16:59:51 -08:00
WayofTime 941173dbf4 Added book entry for the Burning Furnace array. 2018-02-27 17:25:41 -05:00
WayofTime 57c25f0064 - Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. 2018-02-24 20:31:09 -05:00
Nicholas Ignoffo bf2fe1166e Safety for UUID check in lava crystal (#1238) 
some weird mod was doing weird tooltip things weirdly
 2018-02-23 16:47:34 -08:00
Nicholas Ignoffo 106532061d Alchemy Table now supports new recipe API 2018-02-19 15:41:18 -08:00
Nicholas Ignoffo 562e62725c Add Sulfur and Saltpeter to OreDict (#1235) 2018-02-19 14:07:44 -08:00
Nicholas Ignoffo 77bdbed8b5 Nullcheck tile in Lava/Water/Void sigils (#1236) 2018-02-19 14:06:05 -08:00
Nicholas Ignoffo 0beef19ba1 Seer Sigil should display tranquility data (#1234) 2018-02-19 14:04:32 -08:00
Nicholas Ignoffo 7a288a7292 Update changelog + version 2018-02-18 16:05:11 -08:00
Nicholas Ignoffo 37c8012741 Ignore blank inscription tools 2018-02-18 15:56:03 -08:00
Nicholas Ignoffo 64336f6f78 Sigils should only stack to 1 2018-02-18 15:55:52 -08:00
Nicholas Ignoffo c5b0b61315 Add HUD elements for tranquility (#1233) 2018-02-18 15:55:40 -08:00
Nicholas Ignoffo ea47db3e5d Wrong extenderoo 2018-02-18 14:33:50 -08:00
Nicholas Ignoffo ee42f6ddc2 Slates and inscription tools should use ItemEnum properly 2018-02-18 14:20:36 -08:00
Nicholas Ignoffo 74eaabff8e Bounce array now behaves as a pillow while sneak (#1196) 2018-02-17 16:37:04 -08:00
Nicholas Ignoffo c05336ac9f "Temporarily" disable cross-dimension entity teleports 2018-02-17 16:27:57 -08:00
Nicholas Ignoffo 539879dbd7 Mod ID filter should only be based on the modid (#1179) 
Dangit way
 2018-02-17 16:10:27 -08:00
Nicholas Ignoffo 0cb9d66c81 Satiated Stomach will now let you gorge yourself if you're really hungry (#1188) 
If the user is below 5 saturation, it will no longer ignore above-max saturation
foods.
 2018-02-17 15:50:11 -08:00
Nicholas Ignoffo 6ffe4b8f58 Fix localization for augmented capacity and self sacrifice runes 2018-02-17 15:36:50 -08:00
Nicholas Ignoffo 41baaaf28e YARTF (yet another ray trace fix) (#1228) 2018-02-17 15:07:54 -08:00
Nicholas Ignoffo 441e7b8952 Fix Lava Crystal being consumed 2018-02-17 10:38:33 -08:00
Nicholas Ignoffo 90a071ae23 Fix some logger usages 2018-02-17 09:54:29 -08:00
Nicholas Ignoffo f89b5a005a Logging for plugin gathering 
Moved spammy API stuff to a separate logger
 2018-02-17 09:48:17 -08:00
Nicholas Ignoffo f49e661eb6 Make sure we're looking at a block before doing blocky things (#1227) 2018-02-17 09:26:35 -08:00
Nicholas Ignoffo 0e986a0bdf Slightly alter the altar renderer 2018-02-16 23:58:24 -08:00
Nicholas Ignoffo b29ade63f0 Logging overhaul 2018-02-16 23:48:28 -08:00
Nicholas Ignoffo 49394b56d6 Coerced augmented flask recipe outputs out of hiding (#1200) 2018-02-16 17:10:00 -08:00
Nicholas Ignoffo 5920d9124d Blood Altar will now be less stingy without outputs 2018-02-16 16:48:21 -08:00
Nicholas Ignoffo e4e6a8c4ca Cleanup Altar Upgrade system 2018-02-16 16:37:02 -08:00
Nicholas Ignoffo 2fecb427fd Merge apibutnotreally with the main packages 
Do not consider anything outside of the true API safe to use. And even then,
I'm changing things. Just wait. Please I beg you.
 2018-02-15 18:49:07 -08:00
Nicholas Ignoffo 616c08094b Run formatter 2018-02-14 23:38:57 -08:00
Nicholas Ignoffo 2afc235af7 Move API to it's own source set 2018-02-14 23:37:23 -08:00
Nicholas Ignoffo c03af41c88 Some subitem cleanup 
Still lots left to do. This will help prepare for The Flattening.
 2018-02-13 23:32:15 -08:00
Nicholas Ignoffo 65b89795bc Remove unnecessary base bindable class 
Jarbo 8 exists
 2018-02-13 17:24:06 -08:00
Nicholas Ignoffo 3fb708d2be Fixed crafting order of decor bricks so polished is no longer a lonely boi (#1221) 2018-02-13 16:57:21 -08:00
Nicholas Ignoffo fa59e7000a Mark of the Falling Tower now demands sacrifices again (#1222) 2018-02-13 16:31:30 -08:00
Nicholas Ignoffo 7167aba23c Move Divination output to a HUD element 
RIP chat spam 2014-2018

:hype:
 2018-02-12 19:45:09 -08:00
Nicholas Ignoffo 3286849309 Nerf fast miner array which is actually a buff (#1219) 
I guess Vanilla can't handle Haste III?
 2018-02-11 15:02:55 -08:00
Nicholas Ignoffo 33d6cdb3a9 Fix mundane component being really really really thirsty (#1218) 2018-02-11 14:43:00 -08:00
Nicholas Ignoffo beb71e4c41 Include a dummied version of the alchemy table recipe method so it builds 2018-02-11 12:02:44 -08:00
Nicholas Ignoffo f974f44aeb Fixup Alchemy Array JEI compat 2018-02-11 11:53:45 -08:00
Nicholas Ignoffo 123b06c288 Alchemy arrays should mostly function now (#1202) 
Rewrites the crafting recipe portion of alchemy arrays. Currently the rewritten
portion is wrapped in the old stuff. Ideally the remaining old stuff will
be rewritten as well.

Mods who wish to do custom array effects still need to depend on internal
classes and I think this is fine.
 2018-02-11 11:40:13 -08:00
Nicholas Ignoffo 4b5f8a9685 Move entity registry to new Forge system 2018-02-11 10:16:09 -08:00
Nicholas Ignoffo 163fe864e5 Soul Snares should not trigger on players. Especially not in a weird way (#1216) 2018-02-11 10:15:16 -08:00
Nicholas Ignoffo 47482b6add Javadoc the new API 2018-02-11 00:39:04 -08:00
Nicholas Ignoffo 03fece58fa Rewrite Hwyla integration 
Now properly makes use of the API
 2018-02-08 19:01:12 -08:00
Nicholas Ignoffo 9f6a4983a6 Update JEI compat for Forge and Altar 2018-02-07 21:45:40 -08:00
Nicholas Ignoffo 2d3f86aaf8 Fixup Soul Forge crafting 2018-02-07 18:46:18 -08:00
Nicholas Ignoffo e3cef5ee76 Add support for being in the mood to run on dedicated servers (#1211) 2018-02-07 17:02:53 -08:00
Nicholas Ignoffo 80e7b50dde Move Soul Forge to new recipe API 2018-02-06 22:17:06 -08:00
Nicholas Ignoffo 57591973a3 Move Altar to new recipe API 2018-02-06 21:40:50 -08:00
Nicholas Ignoffo 50fd02b6aa Missed some value manager references 2018-02-06 21:27:23 -08:00
Nicholas Ignoffo f8c734bc96 Implemented new Tranquility value API 
For quick compat, mods can now register a static state-based tranquility
value for their blocks. More
 2018-02-06 21:24:40 -08:00
Nicholas Ignoffo d67ed054ff New recipe registration API 2018-02-06 19:18:29 -08:00
Nicholas Ignoffo 59f171ca5b Forgot lang 2018-02-06 19:00:15 -08:00
Nicholas Ignoffo 739c1aa05f Cleaner sub-item implementation 
Todo: Move more sub items to use it
 2018-02-06 18:59:47 -08:00
Nicholas Ignoffo 8be8cc30b9 nullcheck obtained entity entries (#1206, 1207) 
No idea what's going on here but aight
 2018-02-06 17:04:04 -08:00
Nicholas Ignoffo 27e41e2e77 Fix crash when obtaining owner from an unbound bindable item (#1205) 2018-02-05 17:56:06 -08:00
Nicholas Ignoffo e79f6c44d6 Fix crash on servers (#1204) 2018-02-05 17:37:23 -08:00
Nicholas Ignoffo 63f88f6bff Sorted out the sentient sword's identity crisis (#1201) 2018-02-05 17:36:13 -08:00
Nicholas Ignoffo 1205c41712 Fix GUIs not rendering backgrounds and tooltips (#1203) 2018-02-05 17:25:25 -08:00
Nicholas Ignoffo ddaadfbe52 Swap the API packages 
The new one is now built for the api jar and the old one is now internal.
It will slowly be moved around to sane places within the internal code. Most
of the features provided in the old "api" are addon specific features which
will generally rely on the main jar anyways. The new API will be specific
to compatibility features, such as blacklists, recipes, and value modification.
 2018-02-05 17:04:46 -08:00
Nicholas Ignoffo 3536a25cc3 Add modid to subscriber annotations 
(cherry picked from commit 7cac007)
 2018-02-04 19:16:09 -08:00
Nicholas Ignoffo 8a4117106d Stop using a custom bus subscriber annotation 
I'm sorry, past self, but Forge has had one since like 1.10, it's time to
move on. It's for the better.

(cherry picked from commit 9de2354)
 2018-02-04 19:15:37 -08:00
Nicholas Ignoffo 66ea131377 Fix JEI not seeing orbs as different items 2018-02-04 19:12:24 -08:00
Nicholas Ignoffo acdf40e2b6 Update tile entity mappings 
(cherry picked from commit c00affa)
 2018-02-04 19:10:07 -08:00
Nicholas Ignoffo 42931bcf0e JSON recipes, much to the displeasure of Elucent and shadows 
feelsgoodman

(cherry picked from commit c23d577)
 2018-02-04 19:09:37 -08:00
Nicholas Ignoffo cc8d5af401 Rename meteor files to lowercase 
(cherry picked from commit 59df51a)
 2018-02-04 19:02:07 -08:00
Nicholas Ignoffo d99cf77288 Move config to annotation system 
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
 2018-02-04 19:01:27 -08:00
Nicholas Ignoffo a10b2ece9a Fixed altar detection 2017-08-16 17:29:24 -07:00
Nicholas Ignoffo 37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo 3b173ecf17 Some models work, some don't 2017-08-15 23:01:37 -07:00
Nicholas Ignoffo 08258fd6ef Run formatter 2017-08-15 21:30:56 -07:00
Nicholas Ignoffo 61c44a831b Fix some things that went missing 2017-08-15 21:24:59 -07:00
Nicholas Ignoffo 348fee1e2a It compiles. Somehow. 2017-08-15 20:21:55 -07:00
Nicholas Ignoffo 554c9852e6 Move commonly used API systems to a plugin based system 
Create a class that implements IBloodMagicPlugin and annotate it with
`@BloodMagicPlugin`. The `register` method will be called during init.

Currently implemented systems:
- Blacklisting
  - Teleposer
  - Teleposer (entity)
  - Transposition
  - Well of Suffering
  - Green Grove
- Setting sacrificial values
- Adding altar components
 2017-08-15 18:14:28 -07:00
Nicholas Ignoffo 5fcdd978d7 this doesn't compile yet, but have something to peek at 2017-08-14 20:53:46 -07:00
Nicholas Ignoffo 8c12b48695 Fix ItemStackWrapper ignoring stack's NBT (#1155) 
who even made this class i mean come on this is such a stupid thing to do like omgwtf what a moron
 2017-06-21 19:14:25 -07:00
Nicholas Ignoffo 16d4609a48 Fix HarvestHandlerStem not working (#1165) 2017-06-21 19:11:08 -07:00
Graham Hughes 061850ee29 Add crop support for Pam's Harvestcraft and Roots herbs (#1164) 
* Add harvest ritual support for Pam's crops.

* Add roots crops.

* Per @TehNut, use BM instance logger.

* Call getMaxAge rather than hardcode 3.
 2017-06-21 18:46:42 -07:00
Nicholas Ignoffo f576ec595b Fix some inverted logic with Sentient Mimics (#1149) 2017-06-01 22:31:17 -07:00
Nicholas Ignoffo 273dca3e4d Fix client not registering capability (#1150) 2017-06-01 22:17:46 -07:00
Nicholas Ignoffo f7b8dc0d84 API-facing methods for removing recipes (#1152) 2017-06-01 22:16:24 -07:00
Nicholas Ignoffo 95634f01c3 Merge remote-tracking branch 'origin/1.11' into 1.11 2017-05-27 16:04:55 -07:00
Nicholas Ignoffo 6656fe58dc Moved living armor notifications to action bar 2017-05-27 16:04:40 -07:00
NoX-programer e95b6f3bf2 Update ru_RU.lang: fix many typos (branch 1.11) (#1148) 
* Update ru_RU.lang

* Update ru_RU.lang
 2017-05-24 06:00:48 -07:00
Nicholas Ignoffo 38e54a4e2f Fixed NPE in Fluid Filter (#1139) 
(cherry picked from commit 9a7db20)
 2017-05-23 18:56:43 -07:00
Nicholas Ignoffo e9ce88fc73 Fixed capacity on tank being reset when tile was reloaded (#1138) 2017-05-23 18:53:32 -07:00
Nicholas Ignoffo 2c08d046f8 Node Router now prints to action bar instead of chat 2017-05-21 13:45:24 -07:00
Nicholas Ignoffo abef1bada7 Add support for ExU and AA crops to plantable handler (#1107) 
Theoretically. Don't actually know if their stuff is written properly.
 2017-05-21 13:08:29 -07:00
Nicholas Ignoffo c7f644528b Fix permission level for commands (#1117) 2017-05-21 12:56:51 -07:00
Nicholas Ignoffo 5b9bb07d8d Large Bloodstone Bricks should get 4 from crafting (#1125) 2017-05-21 12:29:52 -07:00
Nicholas Ignoffo a2ceee3218 Fix diamond meteor giving blocks + dynamically calculate weight (#1126) 2017-05-21 12:25:35 -07:00
Nicholas Ignoffo 2789e351c0 Bound tools now properly mark themselves as tools 
Because *somebody* forgot to do that.

(cherry picked from commit 717279d)
 2017-05-08 19:37:38 -07:00
Nicholas Ignoffo 7c19e2e2d2 Sanity check pos passed by client 
Prevents malicious clients from loading arbitrary chunks.

Thanks to @pau101 for spotting it.
 2017-04-30 17:20:17 -07:00
Nicholas Ignoffo bffd191efd Re-implement Soul Fray on death 
This should be all that's needed
 2017-04-03 17:57:40 -07:00
Nicholas Ignoffo 83bba44ab6 Forgot to lowercase these 2017-04-03 17:32:20 -07:00
NatsuArashi dd7f94e756 Traditional Chinese update. (#1116) 
* Update zh_TW.lang

* Create zh_TW.lang

* Update zh_TW.lang

(cherry picked from commit f44ad3a)
 2017-04-03 17:10:35 -07:00
Nicholas Ignoffo 805576a19b Allow commands to be used in command blocks (#1117) 2017-04-03 17:03:46 -07:00
Nicholas Ignoffo 78a71e47e0 Fix Alchemy Table overwriting output each time it crafts (#1119) 2017-04-03 16:56:21 -07:00
Urey. Xue 22e3d4d62c Update zh_CN.lang (#1052) 
* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

Also contains update for main language file

* Amendment I

* Amendment II

* use "/cut" to trick String.split(), so that we could manually split page
* Minor improvements on translation

* Amendment III

* Amendment IV

* Amendment V

* Amendment VI

(cherry picked from commit ad46745)
 2017-03-28 19:35:31 -07:00
Nicholas Ignoffo ed59c4633e Fixed null stack in plantable harvest handler 2017-03-28 19:07:16 -07:00
Nicholas Ignoffo 487c7e4aa3 Forgot one... 2017-03-28 18:48:27 -07:00
Nicholas Ignoffo f17f284575 Nullcheck the ritual activator (#1113) 2017-03-28 18:45:45 -07:00
Nicholas Ignoffo 3134f6b9f3 Fix bound tools not checking if they're bound (#1114) 2017-03-28 18:40:24 -07:00
Nicholas Ignoffo d524cc32b7 Another null stack in the Sentient Specters 2017-03-28 18:32:25 -07:00
Nicholas Ignoffo 7cafd833c3 Fix fluid dupe when inserting into blood tank with bucket (#1108) 2017-03-20 22:37:23 -07:00
Nicholas Ignoffo a5a47c42aa Rewrite the placer ritual 
Includes a slight nerf: Instead of placing the entire 25x25 at the same time, it now places 1 block at a time.

This was brought on by 30 minutes of debugging an intended feature that was mistaken for a bug in #1103

TODO: Rewrite most of the rituals to get rid of any remaining legacy code
 2017-03-14 20:17:57 -07:00
Nicholas Ignoffo 216bdb2d2e Fixed many sigils using the wrong stack for their logic (#1102) 
This is why you use custom methods for things like this instead of MC methods
 2017-03-14 19:33:13 -07:00
Nicholas Ignoffo 41c2f37042 Change lots of recipes to use oredict (#1101) 
I probably missed a few
 2017-03-14 19:13:08 -07:00
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
Nicholas Ignoffo 53afcc2fb0 No-spam messages should be handled on the main thread (#1035) 
(cherry picked from commit 305e001)
 2017-02-12 01:31:58 -08:00
Nicholas Ignoffo 930660bc30 Update Blood Tank model and texture 
Thanks @InsomniaKitten

Need to rewrite inventory model handler because you *cannot* use GL there.

(cherry picked from commit 6ff12aa)
 2017-02-12 01:31:37 -08:00
Nicholas Ignoffo 11fe41c654 Fix durability bars 2017-01-02 02:28:02 -08:00
Nicholas Ignoffo e845332846 Fix compile/model errors 2017-01-02 02:07:52 -08:00
Nicholas Ignoffo 78093631c5 Empty flasks can now be refilled (#976) 
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.

(cherry picked from commit 4c614df)
 2017-01-02 01:59:24 -08:00
Nicholas Ignoffo f3f1dfb08a Fix Expulsion whitelist (#1010) 
(cherry picked from commit b6eae2f)
 2017-01-02 01:58:31 -08:00
Nicholas Ignoffo 91a900d84e Add current charge to Waila tooltip (#1013) 
(cherry picked from commit c7f2b7d)
 2017-01-02 01:58:24 -08:00
Nicholas Ignoffo 4c3938c0f9 Change meteor config NPE with EnderCore to a useful error message 
(cherry picked from commit 09007c5)
 2017-01-02 01:57:44 -08:00
Nicholas Ignoffo 1f3686720c Gold meteor only needs it's version set once 
(cherry picked from commit fffed0e)
 2017-01-02 01:57:42 -08:00
Nicholas Ignoffo e0c0d095df Fix meteor config not generating new defaults 
(cherry picked from commit 5c1b8b1)
 2017-01-02 01:57:35 -08:00
Nicholas Ignoffo bd4efb1320 Blacklist sentient spectres from WoS and Sacrifice (#1015) 
A config refresh is required for this to take effect. Needs mentioning in changelog.

(cherry picked from commit a5449d3)
 2017-01-02 01:57:29 -08:00
WayofTime e8dd07893e Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. (#1011) 
(cherry picked from commit f083071)
 2017-01-02 01:57:23 -08:00
WayofTime 60eba2071d Made it so the book does not give the filling recipe when the Blood Orb recipe is queried. 
(cherry picked from commit afa3d1e)
 2017-01-02 01:57:17 -08:00
Nicholas Ignoffo c46ed3e648 Sigils should draw LP from the bound network, not the user 
(cherry picked from commit 082d2b8)
 2017-01-02 01:57:07 -08:00
tartaric_acid 852d32f233 Update zh_CN file (#1003) 
* Update zh_CN file

* Fix some mistakes (WIP)

* Finish all fix

* Fix some mistakes

(cherry picked from commit ae2ff03)
 2017-01-02 01:35:48 -08:00
WayofTime 65104db564 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter. 
(cherry picked from commit a5a17f6)
 2017-01-02 01:34:33 -08:00
Nicholas Ignoffo a628adfde8 Lowercase all the tooltip strings 2017-01-02 01:18:29 -08:00
Nicholas Ignoffo 574056203d Fix JEI compat 2017-01-02 01:18:02 -08:00
Nicholas Ignoffo 4ec321aaac Annnd they're back 2017-01-02 00:19:45 -08:00
Nicholas Ignoffo c34ee90b4e Okay let's fix these the hard way. 2017-01-02 00:18:39 -08:00
Nicholas Ignoffo ed27873fbe It runs! 2017-01-02 00:10:28 -08:00
Nicholas Ignoffo 51e10eaad2 Everything else except sigils 2017-01-01 22:26:42 -08:00
Nicholas Ignoffo 128b3d29b0 Lowercase modid 2017-01-01 21:50:35 -08:00
Nicholas Ignoffo f5a68adc2e Remove all the package-info.java's 
Except the API one
 2017-01-01 21:49:52 -08:00
Nicholas Ignoffo d80afb18f0 More progress 2017-01-01 21:43:34 -08:00