Commit Graph
165 Commits
Author SHA1 Message Date
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
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
Vexatos f331cd28cc Oops. 2014-08-18 17:49:38 +02:00
Vexatos 2332c65ac8 Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin
Conflicts:
	api
2014-08-18 17:45:04 +02:00
Vexatos c419674cdc Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin
Conflicts:
	api
2014-08-18 17:41:26 +02:00
CovertJaguar 72121b3abd Should probably fix this... 2014-08-18 08:29:34 -07:00
CovertJaguar c99eb94d6b We might be able to reduce some of the world breakage...particually of items (save the bees!) 2014-08-18 08:23:14 -07:00
Vexatos 1e86c1982f I want to kill someone right now. 2014-08-18 16:33:32 +02:00
CovertJaguar 15d40439b6 Minor stuff 2014-08-18 06:28:08 -07:00
Vexatos 80b652dd2c Fixed localizeAndFormat, MIGHT have caused issues otherwise, not sure. 2014-08-18 14:59:02 +02:00
CovertJaguar add3572085 Fix missing support for ForestryBlock 2014-08-18 05:38:48 -07:00
Vexatos 88ddc9a85a Fixed custom bee names, localized even more things. 2014-08-18 14:37:45 +02:00
CovertJaguar 83789ae8f7 Fix item and block localization. This is a world breaking change! 2014-08-18 05:20:29 -07:00
CovertJaguar 5fcc76a2fa Move en_US to localization repo 2014-08-18 05:01:22 -07:00
CovertJaguar d2f2d61997 Merge pull request #122 from Vexatos/master-fork
Even more localization additions.
2014-08-18 00:45:26 -07:00
Vexatos 51735e05f2 Updated lang submodule again. 2014-08-18 09:39:14 +02:00
Vexatos db09199a38 Slight improvements 2014-08-18 09:37:46 +02:00
Vexatos 0fab189f32 Updated lang submodule 2014-08-18 09:19:40 +02:00
Vexatos ad2117cad8 Localized even more things. 2014-08-18 09:17:08 +02:00
Vexatos 37cdfe151e Updated de_DE.lang 2014-08-17 21:20:28 +02:00
SandGrainOne 9e782c421e Merge pull request #121 from Vexatos/master-fork
More localization fixes. Allow custom bee names.
2014-08-17 20:41:19 +02:00
Vexatos 4c74e3865f Fixed indentation 2014-08-17 20:36:05 +02:00
Vexatos bc4f609eba More localization fixes. Allow custom bee names. 2014-08-17 20:32:55 +02:00