Jonathan Smith
|
c8a01f7da0
|
Merge pull request #1800 from yrsegal/master
Multiparts now work on both the client and the server.
|
2016-02-10 21:48:58 +00:00 |
|
yrsegal
|
59b177e231
|
Multiparts now work on both the client and the server.
|
2016-02-10 13:51:31 -05:00 |
|
Jonathan Smith
|
27a5991350
|
Merge pull request #1798 from isochronous/lex-botania-lang_en-corrections
Lexica Botania lang_en corrections
|
2016-02-10 08:03:22 +00:00 |
|
Jeremy McLeod
|
e0023c0566
|
Corrected spelling & grammar in Lexica Botania for:
- Manastorm Charge
- Teru Teru Bozu
- Mana Blaster
- Rod of the Lands
- Manasteel Equipment
- Terrasteel Armor
- Terra Shatterer
|
2016-02-09 19:42:56 -05:00 |
|
Jonathan Smith
|
6135f44792
|
Merge pull request #1788 from isochronous/patch-1
Fixed a typo
|
2016-02-05 00:08:26 +00:00 |
|
Jeremy McLeod
|
5270f5ea20
|
Fixed a typo
adjusted != adjacent
|
2016-02-04 15:20:30 -05:00 |
|
Jonathan Smith
|
ea10c48439
|
Merge pull request #1783 from nekosune/master
Added quartz variants to Ore Dictionary
|
2016-02-02 22:05:43 +00:00 |
|
nekosune
|
3593d4b759
|
Added quartz variants to Ore Dictionary
|
2016-02-02 21:59:03 +00:00 |
|
nekosune
|
9e37f37c53
|
Added quartz variants to Ore Dictionary
|
2016-02-02 21:40:38 +00:00 |
|
Vasco Lavos
|
f0f372205c
|
Update contributors.properties
|
2016-02-02 17:35:45 +00:00 |
|
Jonathan Smith
|
7bfeef18a9
|
Merge pull request #1782 from PikadudeNo1/patch-1
Fixed Marimorphosises having incorrect downward range
|
2016-02-01 14:55:50 +00:00 |
|
Pikadude No. 1
|
9a60705967
|
Fixed Marimorphosises having incorrect downward range
|
2016-02-01 04:45:47 -08:00 |
|
Jonathan Smith
|
0e617e6046
|
Merge pull request #1781 from howtonotwin/inkwellfix
Newly infused mana inkwells show durability bar
|
2016-02-01 09:38:19 +00:00 |
|
Rasheeq
|
d32ce6c519
|
Newly infused mana inkwells show durability bar
No more confused players!
Also fixes williewillus/Botania#91.
|
2016-01-31 20:54:54 -05:00 |
|
Jonathan Smith
|
e0293afad0
|
Merge pull request #1779 from NatsuArashi/patch-15
Update zh_TW.lang
|
2016-01-29 09:13:18 +00:00 |
|
NatsuArashi
|
dfb2ef2a61
|
Update zh_TW.lang
|
2016-01-29 16:08:29 +08:00 |
|
TheWhiteWolves
|
74d4130ba5
|
Add some default entities from vanilla and botania to the gravity rod blacklist
|
2016-01-24 17:39:04 +00:00 |
|
TheWhiteWolves
|
275729d54e
|
Popped a null check in onEquipped() to ensure player isn't null, hopefully helps with Issue #1757
|
2016-01-21 23:13:41 +00:00 |
|
TheWhiteWolves
|
adc06dc6ce
|
Added a blacklist to the Rod of the Shaded Mesa
|
2016-01-21 22:46:02 +00:00 |
|
Jonathan Smith
|
d8a46650ee
|
Merge pull request #1762 from NatsuArashi/patch-14
Update zh_TW.lang
|
2016-01-19 14:26:26 +00:00 |
|
NatsuArashi
|
177c5b1d1b
|
Update zh_TW.lang
FIX SOMETHING...?
|
2016-01-19 19:31:17 +08:00 |
|
Jonathan Smith
|
089c8c674c
|
Merge pull request #1760 from Eladkay/patch-3
Fixed license link in FAQ page.
|
2016-01-18 16:14:45 +00:00 |
|
Eladkay
|
2df3b356fd
|
Fixed license link in FAQ page.
If issue is not obvious: https://gyazo.com/c4657c529a337f37a3c67925e8e5e61e
|
2016-01-18 15:00:17 +02:00 |
|
TheWhiteWolves
|
a6896f250f
|
bump API version
|
2016-01-17 14:51:51 +00:00 |
|
TheWhiteWolves
|
d431207eec
|
Change to use API version of disposable blocks and implement semi-disposable
|
2016-01-17 14:51:39 +00:00 |
|
TheWhiteWolves
|
c0e7353192
|
Move disposable blocks list to API and add hook and semi disposable list
|
2016-01-17 14:50:50 +00:00 |
|
Jonathan Smith
|
f2eea3ce92
|
Merge pull request #1754 from blacksmithgu/swapper-sides
Bugfix followup - Block swappers use sidedness to control concurrency
|
2016-01-16 11:19:02 +00:00 |
|
Michael Brenan
|
24cf30a29e
|
Bugfix followup - Block swappers use sidedness to control concurrency
|
2016-01-15 18:28:06 -06:00 |
|
Jonathan Smith
|
5bc520368d
|
Merge pull request #1752 from blacksmithgu/patch-1749
Fix #1749 - Mana Tablets no longer lose durability in storage drawer
|
2016-01-15 21:28:32 +00:00 |
|
Michael Brenan
|
54f1dd0478
|
Fix #1749 - Mana Tablets no longer lose durability in storage drawer
|
2016-01-15 03:26:31 -06:00 |
|
Jonathan Smith
|
b7c0c12e5b
|
Merge pull request #1750 from blacksmithgu/swapper-concurrency
Add preemptive bugfix - Swappers now threadsafe
|
2016-01-15 09:09:26 +00:00 |
|
Michael Brenan
|
5438138c93
|
Add preemptive bugfix - Swappers now threadsafe
|
2016-01-14 22:56:01 -06:00 |
|
Jonathan Smith
|
f6bf6589ad
|
Merge pull request #1743 from yrsegal/master
IslandTypes can now be added by addons
|
2016-01-14 16:59:20 +00:00 |
|
Jonathan Smith
|
da43dd8ca0
|
Merge pull request #1748 from blacksmithgu/patch-1722
Hotfix #1722 - Allow client to control sash speedup and slowdown
|
2016-01-14 16:55:01 +00:00 |
|
Jonathan Smith
|
fdd1ad8d4e
|
Merge pull request #1747 from blacksmithgu/patch-1726
Fix #1726 - Accessories on other players now render in the proper position
|
2016-01-14 16:54:53 +00:00 |
|
Jonathan Smith
|
d4dd4cf42f
|
Merge pull request #1746 from blacksmithgu/gaia-head
Clean up common/item/ItemGaiaHead.java
|
2016-01-14 16:54:46 +00:00 |
|
Michael Brenan
|
0595397943
|
Hotfix #1722 - Allow client to control sash speedup and slowdown
|
2016-01-13 23:07:47 -06:00 |
|
Michael Brenan
|
d0faf3c3c6
|
Fix #1726 - Accessories on other players now render in the proper position
|
2016-01-13 22:53:21 -06:00 |
|
yrsegal
|
cbac5fbb32
|
IslandTypes can now be added by addons
|
2016-01-13 17:44:47 -05:00 |
|
Michael Brenan
|
f5210997ca
|
Clean up common/item/ItemGaiaHead.java
|
2016-01-13 16:21:47 -06:00 |
|
Jonathan Smith
|
d3055c4c4d
|
Merge pull request #1742 from blacksmithgu/patch-1700
Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic
|
2016-01-13 12:24:40 +00:00 |
|
Jonathan Smith
|
c94df0bf67
|
Merge pull request #1738 from blacksmithgu/master
Fix #1728 - Grass seeds will not spread to dirt/grass blocks under other blocks
|
2016-01-13 12:24:32 +00:00 |
|
Michael Brenan
|
4abb2cdd89
|
Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic
|
2016-01-13 03:42:32 -06:00 |
|
Jonathan Smith
|
cabcab80e2
|
Merge pull request #1739 from blacksmithgu/patch-1724
Fix #1724 - Slabs and snow don't prevent Rod of Shifting Crust replacement
|
2016-01-13 09:36:21 +00:00 |
|
Jonathan Smith
|
a2f1776245
|
Merge pull request #1735 from yrsegal/master
Make baubles able to IBlockProvide
|
2016-01-12 12:59:05 +00:00 |
|
yrsegal
|
c20247b680
|
Baubles now able to IBlockProvide
This allows for things like Botanical Addons’ Toolbelt to provide from
the tools in them while worn.
|
2016-01-12 07:47:30 -05:00 |
|
Jonathan Smith
|
a7000e8a47
|
Add Material.gourd to Axe materials.
Closes #1732.
Allows use of the quickest mining tool for items with Material.gourd (Pumpkins, Melons, etc.)
|
2016-01-12 12:12:20 +00:00 |
|
Michael Brenan
|
ac88d0627a
|
Fix #1724 - Slabs and snow prevent Rod of Shifting Crust replacement
|
2016-01-12 01:32:15 -06:00 |
|
Michael Brenan
|
cbcc49b896
|
Fix #1728 - Pasture seed grass spreading obeys grass block growth rules
|
2016-01-11 18:28:01 -06:00 |
|
Vasco Lavos
|
b7975401b3
|
Merge pull request #1727 from yrsegal/master
Make CanFit (IFlowerComponent) affect items fitting into petal apothecary
|
2016-01-09 22:36:57 +00:00 |
|