Commit graph

663 commits

Author SHA1 Message Date
WayofTime 1bb699cb9a Merge pull request #551 from grundyboy34/patch-1
Updated RitualEffectGrowth to support non-standard farms
2016-01-08 07:30:13 -05:00
grundyboy34 63c7d16edc Updated RitualEffectGrowth to support non-standard farms
Updated RitualEffectGrowth's y range from a static value to scaling with the range. This is to add support for mods such as agricraft, in which crops aren't always only on top of soil.
2016-01-07 23:16:24 -05:00
WayofTime 789b3c2afb Merge pull request #523 from ljfa-ag/patch-1
Fix #347 again...
2015-12-31 11:36:08 -05:00
ljfa a30b908e80 Fix #347 again...
Lit redstone ore has no item attached to it, so the method was wrongly returning false after I added the null item check
2015-12-29 20:55:49 +01:00
WayofTime d5dc5bf328 Changed TEBelljar to TEBellJar 2015-10-31 17:02:34 -04:00
WayofTime d4a2bff7c2 Fiddling around after building -15. 2015-10-31 16:57:45 -04:00
WayofTime 2a4e53714a Merge pull request #482 from TehNut/master
Fix crashing with BiblioWoods Forestry
2015-10-26 20:47:32 -04:00
Nick b9390b2243 mcmod.info will now autoreplace version 2015-10-26 16:39:28 -07:00
Nick b38db9ae7a Swallow the NPE caused when other mods add recipes with null inputs
Also swallows the NPE caused by players adding a dead and outdated mod to their instance.

Read as: Screw you BiblioWoods Forestry.
2015-10-26 16:35:53 -07:00
WayofTime 0764dd7be8 Merge pull request #473 from TehNut/patch-1
Fix potential issue with reloading configs
2015-10-18 06:57:49 -04:00
Nick Ignoffo 3b1d3e968d Fix potential issue with reloading configs 2015-10-17 19:11:26 -07:00
WayofTime 6b15fb823f Merge pull request #468 from TehNut/master
A few command related things
2015-10-12 16:46:05 -04:00
Nick 6e54f83ebd Localize new commands + Add an Orb command 2015-10-12 12:44:15 -07:00
Nick 80b76a2dbb Add a "set" command for setting LP to a given amount 2015-10-12 11:23:27 -07:00
WayofTime 0cb0239276 Merge pull request #467 from Arcaratus/master
ALL THE LP CONFIGS
2015-10-10 15:49:47 -04:00
Arcaratus 3793327f0c Added the utmost LP configs 2015-10-10 14:06:55 -04:00
Arcaratus 6b8942730c Added the utmost LP configs 2015-10-10 14:01:23 -04:00
Arcaratus a5eefd8bec Added the utmost LP configs 2015-10-10 14:00:38 -04:00
WayofTime 0f7e2ba813 Merge pull request #466 from TehNut/master
Knocking out the Todo list
2015-10-09 20:29:35 -04:00
Nick 185e461f13 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java
2015-10-09 17:27:00 -07:00
WayofTime d259783ead Merge pull request #465 from Necr0/patch-1
Fix Invisible Items
2015-10-09 08:37:22 -04:00
Nick 2099826500 API interface to add variant blocks to altar structure 2015-10-08 23:57:04 -07:00
Nick 40cb3a501a Fix all (known) instances of ugly 2D item model rendering 2015-10-08 23:56:22 -07:00
Nick 731f92a7fd Rework commands to be sub commands of /bloodmagic 2015-10-08 23:56:00 -07:00
Nick fa78706fca Allow Creative players to bypass Aura of Expulsion 2015-10-08 23:55:26 -07:00
Necr0 e9c5abf454 Fix Invisible Items
When the clients graphics are set to be "fast" the client renders items as 2d plains always facing the player and not as rotating 3d objects. So if the item rotates it is invisible half of the time because it has no backside.
I don't know where else you used this code but please consider fixing it.
-Necr0
2015-10-08 04:20:19 +02:00
WayofTime 9fb1f61a6a Merge pull request #464 from TehNut/master
Various fixes and improvements (Details in description)
2015-10-07 18:55:51 -04:00
Nick a91d350037 Altar now accepts Chisel variants of given blocks
Will require a re-setup of the workspace (`gradlew [eclipse|idea]`) in order to download the Chisel API. This launches just fine without Chisel installed.
2015-10-06 23:04:39 -07:00
Nick 83b26eb033 Fix my breakage of the altar checking 2015-10-06 22:08:51 -07:00
Nick 250debb604 Drastically improve the Teleposer Blacklist
It now functions correctly. Only downside to this is that currently using the wildcard value of `*` does not work. Need to figure out how to cleanly do that.
2015-10-06 20:38:01 -07:00
Nick 4a86518366 Should fix getting free iron buckets from non-iron buckets 2015-10-06 19:45:46 -07:00
Nick bd4b2d2c52 Fix z-fighting of blood in altar when there is none 2015-10-06 19:40:47 -07:00
Nick 27ac16b5d2 Allow disabling of Weak Rituals 2015-10-06 19:23:25 -07:00
WayofTime 47849d4ab2 Merge pull request #463 from UndeadZeratul/Fix-Harvest-Levels
Allow Bound Tool Harvest Levels to be Altered
2015-10-06 21:27:45 -04:00
Nick fca3a60a1e Allow any instanceof BlockBeacon 2015-10-06 18:24:12 -07:00
UndeadZeratul eaa20628ce Fix Bound Tool Harvest Levels
This way, they'll be 5 by default, but since they now follow Forge's normal way of getting/setting the harvest level on tools, other mods - such as Iguana Tinker Tweaks - can alter their harvest levels as desired.  When the tools are not activated, they will now return a -1 instead of 0, which results in not being able to be used as a tool at all, rather than the equivalent of a wooden tool.
2015-10-06 18:45:24 -05:00
WayofTime b2985550dc Merge pull request #449 from iambob314/patch-1
Added more biome control in BiomeChanger ritual
2015-10-04 18:42:18 -04:00
WayofTime 277cd0742e Merge pull request #454 from Arcaratus/master
Created package-info file
2015-09-19 15:09:32 -04:00
Arcaratus 25209f78ed Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-09-17 15:40:34 -04:00
Arcaratus 68babbca11 Added a package-info.java file 2015-09-17 15:39:54 -04:00
iambob314 5d94e59314 Actually default to Plains on too much biome skip
(Also cleaned up code style)
2015-09-09 19:02:46 -04:00
iambob314 3cf20bac43 Added more biome control in BiomeChanger ritual
Added the ability to select between matching biomes in the biome changer ritual (Ritual of Gaia's Transformation). Previously, the ritual would always select the first biome that (approximately) matches the given temperature/humidity. However, especially with a mod like Biomes O' Plenty or similar installed, many biomes may match such a specification, and thus many are inaccessible to this ritual.

The added specificity is based a class of additional control items, colored wool, to be placed on the plinths. If one or more colored wool are present, they combine together to yield a "biome skip count," which indicates how many matching biome IDs to skip before settling on one. Since the absence of any wool counts as a skip value of 0, a wool with damage value of 0 counts as 1 skip, a damage value of 1 counts as 2, etc. Multiple wools sum together. If the biome skip count is greater than the number of matching biomes, the ritual defaults to plains, just as if no matching biome were found.

While it's not expected that a player will know the exact skip count to use, trial-and-error can enable fine-grained control, as opposed to the task of specific biome selection often being impossible before.

Example:
* 2 coal and 3 lapis are placed on the plinths, yielding 0.7 temperature and 0.8 humidity.
* Normally, this would always evaluate to biome ID 4, vanilla Forest.
* However, we additionally add one Orange Wool (damage value 1), adding 2 to the biome skip counter. Equivalently, we could have added two White Wools (damage value 0).
* Now, the first two matching biomes will be skipped, and the third is used (likely biome ID 29, Roofed Forest, depending on modpack).
2015-09-09 01:21:50 -04:00
WayofTime f0e4d0feab Merge pull request #435 from Arcaratus/master
Fix TEBelljar and #433
2015-08-27 13:07:06 -04:00
Arcaratus a36c514b63 Fix TEBelljar and #433 2015-08-27 13:02:14 -04:00
WayofTime cd34cb30e8 Fixed the routing focus texture name. 2015-08-23 18:26:20 -04:00
WayofTime 02c613d608 Merge pull request #423 from Arcaratus/master
Vacation commit
2015-08-12 08:35:11 -04:00
Arcaratus 245bfc96ca Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-08-10 22:03:38 -04:00
Arcaratus 8896414a51 Vacation commit 2015-08-10 22:03:08 -04:00
WayofTime 6f66d81d45 Fixed the gradles too. 2015-07-31 12:15:46 -04:00
WayofTime 1aac4686db Attempt to fix repository 2015-07-31 12:09:09 -04:00