Commit Graph
5062 Commits
Author SHA1 Message Date
Vasco Lavos 3dfebeba01 Merge pull request #1911 from Flaxbeard/rework_discount
Reworked getFullDiscountForTools and ManaDiscountEvent
2016-10-14 19:09:13 +01:00
Vasco Lavos b53aba89c5 Merge pull request #1936 from ArukaAlter/patch-1
Update pt_BR.lang
2016-10-14 19:08:23 +01:00
Vasco Lavos a10f6451f3 Merge pull request #1935 from nano001/lang-update
Update ja_JP.lang
2016-10-14 19:08:21 +01:00
Vasco Lavos 9e38727bde Merge pull request #1912 from NatsuArashi/patch-4
Update zh_TW.lang
2016-10-14 19:08:19 +01:00
Vasco Lavos cc648f2372 Fixed the Kindle lens not being able to close nether portals. 2016-10-14 19:07:37 +01:00
Vasco Lavos 8969fcf3a6 Fixed Infrangible Platforms being able to be exploded. 2016-10-14 18:54:01 +01:00
Vasco Lavos 93fd114e9b Right 2016-10-14 18:43:37 +01:00
Vasco Lavos f684ebc80d Added a null check to the Thorn Chakram to prevent it from crashing if the entity that threw it is unloaded. Closes #1944 2016-10-14 18:36:21 +01:00
Vasco Lavos ee96f3366d Fixed munchdews eating leaves below them. Closes #1941 2016-10-14 18:32:15 +01:00
Vasco Lavos c6a7be61a2 Fixed the bauble box GUI not removing the bauble icons for the new slots. Closes #1937 2016-10-14 18:16:13 +01:00
Vasco Lavos 8f3144cfc6 Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-14 18:14:41 +01:00
Vasco Lavos b692f55237 Implemented a workaround for Azanor/Baubles#156 2016-10-14 18:14:21 +01:00
Vasco Lavos 8be7de01e4 Update contributors.properties 2016-10-14 17:36:42 +01:00
Vasco Lavos a3dd76f081 Another build because I'm a derp 2016-10-11 23:50:53 +01:00
Vasco Lavos 806b324d81 Fixed some baubles not working after their slots were changed. 2016-10-11 23:40:48 +01:00
Patric Alexandre f99f213af7 Update pt_BR.lang 2016-10-11 15:57:53 -03:00
Vasco Lavos f8688ef471 Build 329 2016-10-11 19:18:25 +01:00
Vasco Lavos 84e5307973 Buffed the Great Fairy Ring's chance to spawn a pixie by a bunch. 2016-10-11 19:04:16 +01:00
Vasco Lavos 4ae02360ee Changed bauble slots around. 2016-10-11 18:38:17 +01:00
Vasco Lavos 9da1f7d6a1 Use GL11.glPopAttrib in the hourglass render. Should fix #1905 2016-10-11 18:21:22 +01:00
Vasco Lavos 12112b3a65 Fixed lexica gui elements breaking if you rescale it with the new button. Closes #1918 2016-10-11 18:18:50 +01:00
Vasco Lavos 17564633c3 Fixed Luminizers. Closes #1920 2016-10-11 17:57:50 +01:00
Vasco Lavos e143629f5a Don't really need 9, 8 works. 2016-10-11 17:49:12 +01:00
Vasco Lavos 5ad34dd097 Hard dep on the latest baubles. 2016-10-11 17:46:17 +01:00
Vasco Lavos 39cf3e2744 Updated experience equation for 1.8+. Closes #1931 2016-10-11 17:44:24 +01:00
wiiv 5f8dda2e29 New cloak(s). 2016-10-11 17:05:32 +01:00
Vasco Lavos 4d9f300087 Updated for the new version of baubles. Runs, not done yet. 2016-10-11 16:28:05 +01:00
nano_001 7fba8cf86f update ja_JP.lang 2016-10-11 22:39:17 +09:00
Vasco Lavos 589b3320f9 Build 328 2016-10-06 18:39:31 +01:00
Vasco Lavos 88a83d037e The Lexica Botania now detects if it's in an Akashic Tome and updates its display name (in the cover and landing page) accordingly. 2016-10-06 18:33:27 +01:00
Vasco Lavos 4d46b6b05a Fixed Hydroangeas not being passive. Closes #1914 2016-10-06 18:13:00 +01:00
NatsuArashi 5c20346149 Update zh_TW.lang
new lexiconcover
2016-10-05 21:53:31 +08:00
Flaxbeard fc5d794b79 Fixed manasteel helmet not implementing new version of getDiscount 2016-10-04 23:11:18 -05:00
Flaxbeard ab4b7b9e76 Added default body to the deprecated getDiscount method to fix some errors being thrown 2016-10-04 22:31:14 -05:00
Flaxbeard 5157c646f7 Revert "Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis"
This reverts commit 504187dc5d.
2016-10-04 22:26:17 -05:00
Flaxbeard ef3dceccc6 Revert "Updated package-info.java"
This reverts commit ca6361af2d.
2016-10-04 22:26:09 -05:00
Flaxbeard 3f90dd940a Revert "Updated rods so they don't sue the deprecated methods"
This reverts commit a63cbf44f6.
2016-10-04 22:26:01 -05:00
Flaxbeard b98af839fe Reworked getFullDiscountForTools to allow armor sets (or subscribers to ManaDiscountEvent) to adjust mana discount based on the item in use 2016-10-04 22:24:36 -05:00
Flaxbeard a63cbf44f6 Updated rods so they don't sue the deprecated methods 2016-10-04 22:21:40 -05:00
Flaxbeard ca6361af2d Updated package-info.java 2016-10-04 22:21:40 -05:00
Flaxbeard 504187dc5d Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis 2016-10-04 22:21:39 -05:00
Vasco Lavos 7c5159e76e Add .exe to the exclusion list for building the jar 2016-10-04 20:06:57 +01:00
Vasco Lavos 7830137c37 Build 327 2016-10-03 22:58:30 +01:00
Vasco Lavos 531d233b63 Removed Mana Powder from the Hydroangeas recipe. 2016-10-03 22:47:46 +01:00
Vasco Lavos 457f2d1e91 Build 326 (kinda late) 2016-10-03 22:46:54 +01:00
Vasco Lavos e75ae7b30c Stripped metadata from sprites. Smaller filesize! 2016-10-02 21:36:54 +01:00
Vasco Lavos e38556d265 Cleanup. Looks like it's been a while since this was run eh? 2016-10-02 21:29:35 +01:00
Vasco Lavos e862939b7b Recipe/docs for the tripwire lens 2016-10-02 20:27:33 +01:00
Vasco Lavos aacec4336a Change the gourmaryllis up bound up a bit. 2016-10-02 19:35:07 +01:00
Vasco Lavos d84952089f Tripwire lens 2016-10-02 19:27:51 +01:00