Commit Graph
186 Commits
Author SHA1 Message Date
Vexatos 0435df0fb6 Optimized custom x-alyzer species names, they now depend on the type. 2014-08-20 21:03:14 +02:00
SandGrainOne 2aea5d9f76 Update API submodule reference 2014-08-20 20:30:05 +02:00
Alex Binnie ca72a152b3 Exposed getType(ItemStack) for Butterflies, in line with other species
roots
2014-08-20 14:42:36 +01:00
SandGrainOne 8b1db95bd7 Added missing import 2014-08-20 07:27:00 +02:00
CovertJaguar cfba14ed1d Merge pull request #131 from oitsjustjose/master
Remove rendering of other glass blocks' sides.
2014-08-19 18:22:46 -07:00
SandGrainOne d777a08edd Merge pull request #129 from Vexatos/master-origin
Localized butterfly names, tree names and fixed custom bee names, added custom tree names, fixed butterfly species mistakes and fixed spectacles not rendering properly
2014-08-19 21:41:58 +02:00
Vexatos 204c6be9d4 Api submodule update 2014-08-19 21:37:01 +02:00
Vexatos 9035c09f2b Merge remote-tracking branch 'remotes/origin/master' into master-origin 2014-08-19 21:21:32 +02:00
Vexatos 5a700f2a6b Merge remote-tracking branch 'remotes/origin/master' into master-origin 2014-08-19 21:20:11 +02:00
Vexatos b3c74c7911 Merge remote-tracking branch 'remotes/origin/master' into master-origin 2014-08-19 21:17:14 +02:00
SandGrainOne 5adf7d5a7f Update submodules 2014-08-19 21:10:36 +02:00
Vexatos 4c542ccde5 Obligatory lang submodule update. 2014-08-19 21:06:43 +02:00
SandGrainOne 295b838d81 Merge pull request #108 from mezz/tradingCleanup
Cleaned up use of MailAddress
2014-08-19 21:04:09 +02:00
Vexatos 063b3d1545 Fixed all the x-alyzer GUIs, this time with custom everything names! 2014-08-19 21:03:43 +02:00
Vexatos 9fc315c5f0 Obligatory lang submodule update. 2014-08-19 18:51:44 +02:00
Vexatos a7f9244f77 Fixed all the x-alyzer GUIs 2014-08-19 18:48:55 +02:00
oitsjustjose 7d082af004 Remove rendering of other glass blocks' sides.
http://puu.sh/aZ2zd/7bbe5951ee.jpg
2014-08-19 09:26:38 -05:00
Vexatos 0ceba5c884 Updated lang submodule. 2014-08-19 15:17:09 +02:00
Vexatos c2bc3a3d01 Fixed chat messages 2014-08-19 14:59:47 +02:00
Vexatos d516f209f0 Updated lang submodule 2014-08-19 14:20:50 +02:00
Vexatos e162e6fa96 Updated de_DE.lang 2014-08-19 14:17:47 +02:00
Vexatos 1e083c8c3b Fixed butterfly species mistakes. 2014-08-19 14:06:19 +02:00
Vexatos 8f6fcd4ac4 Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin 2014-08-19 13:30:53 +02:00
SirSengir 9948f60e0a Merge pull request #130 from bdew/nodrone
fixed NODRONE check in BeekeepingLogic (was reversed)
2014-08-19 12:38:35 +02:00
Vexatos 21a0307714 Updated lang submodule again. 2014-08-19 11:39:53 +02:00
Vexatos 1927243a94 Fixed Spectacles not rendering properly.
Fixes #28.
2014-08-19 11:38:47 +02:00
Vexatos ae4691712d Updated submodules 2014-08-19 11:29:44 +02:00
Vexatos f4e423bb05 Localized tree names! 2014-08-19 11:27:33 +02:00
Vexatos 54b1b90507 Updated lang submodule 2014-08-19 10:46:17 +02:00
Vexatos ac165d553e Localized butterfly names 2014-08-19 10:42:11 +02:00
bdew 7ce9a0c532 fixed NODRONE check (was reversed) 2014-08-19 11:41:10 +03:00
James Mitchell 91713c8fb8 Cleaned up use of MailAddress 2014-08-18 22:37:05 -07:00
Parker Young 54018d8d6e Delete build.xml
It's all Gradle now
2014-08-18 17:56:12 -04:00
CovertJaguar 9a6e5f858d Bump version to 3.0, its a brand new world! 2014-08-18 13:11:08 -07:00
Parker Young 83090778ac Merge pull request #125 from Vexatos/master-origin
Cleaned up .gitignore and finalized localization fixes.
2014-08-18 15:26:23 -04:00
Vexatos b6375114c5 Updated lang submodule. 2014-08-18 21:20:19 +02:00
Vexatos ca939b23b1 Updated de_DE.lang 2014-08-18 21:18:48 +02:00
Vexatos ff6888734b Fixed order of things 2014-08-18 21:11:47 +02:00
Vexatos b35e597ab0 Death message fixes. 2014-08-18 20:45:16 +02:00
Vexatos 3d0227ecff Woops. 2014-08-18 20:26:43 +02:00
Vexatos 8f04a0886a Updated lang submodule with all the fixes. Forestry should now work again (In English) 2014-08-18 20:08:46 +02:00
Vexatos 42229557c9 Final localization fixes, sorted en_US.lang 2014-08-18 20:05:35 +02:00
Vexatos b1a84acbcf Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin 2014-08-18 19:10:31 +02:00
Vexatos 5149ff971b Fixed .gitignore cleanup 2014-08-18 19:09:43 +02:00
Vexatos 3c5da171fb Cleaned up .gitignore 2014-08-18 19:08:36 +02:00
Parker Young aeab0e341c Merge pull request #124 from Vexatos/master-fork
Finally fixed _all_ the localization.
2014-08-18 13:00:35 -04:00
Vexatos 6f4f96a39e More indentation fixes. 2014-08-18 18:51:53 +02:00
Vexatos 55877a34c2 Updated lang submodule 2014-08-18 18:49:47 +02:00
Vexatos 930c0b00dd Fixed indentation 2014-08-18 18:47:57 +02:00
Vexatos b246cf8538 Finally fixed all the localization 2014-08-18 18:44:46 +02:00