upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-10-26 14:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
126 Commits 3 Branches 277 Tags
83789ae8f726631aa435dcb6d445cbcc2b0c4e65
Commit Graph
126 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SandGrainOne 353dc079e9 Merge pull request #120 from Vexatos/master-fork 
Added backpack and command localization.
 2014-08-17 20:03:51 +02:00
Vexatos ebdce508f1 Properly sorted by alphabet 2014-08-17 19:13:54 +02:00
Vexatos 214d6103b7 Added backpack and command localization. 
Saplings and Butterflies take a lot longer to localize. Cannot do this today. Maybe someone else will do it.
 2014-08-17 19:05:49 +02:00
SandGrainOne f839d6da98 Merge pull request #119 from Vexatos/master-fork 
Added grammar entries for bees.
 2014-08-17 19:03:56 +02:00
Vexatos 4896cc58db Fixed indentation 2014-08-17 18:40:41 +02:00
Vexatos ee224f9a49 Added grammar entries for bees. See #118 2014-08-17 18:23:21 +02:00
James Mitchell 3f3d742244 Merge pull request #117 from mezz/103 
Added check for bad centrifuge recipes that crash the game.
 2014-08-17 03:05:04 -07:00
James Mitchell bf1d01752c Added check for bad centrifuge recipes that can crash the game. 2014-08-17 02:56:53 -07:00
SirSengir 1020227e7d Merge pull request #115 from mezz/105 
Better localization for wood blocks
 2014-08-17 11:30:28 +02:00
SirSengir ffb9296476 Merge pull request #114 from mezz/missingPlanks 
Removed registration of planks for wood types that don't have planks
 2014-08-17 11:29:48 +02:00
James Mitchell 86a73bed4c Better localization for wood blocks 2014-08-16 23:11:00 -07:00
James Mitchell aecc1632b1 Removed registration of planks for wood types that don't have planks 2014-08-16 18:48:33 -07:00
SandGrainOne 0c6491c80b Update API submodule 
Fixes #107
 2014-08-17 01:30:57 +02:00
SandGrainOne bdbf3a4932 Fixing TradeStation stamp and paper usage 
Fixes #63
 2014-08-16 12:15:41 +02:00
SirSengir 23b3395a5d Merge pull request #94 from mezz/invalidAssets 
Removed registration of unknown missing textures
 2014-08-16 10:59:44 +02:00
CovertJaguar 7635af7fa2 We only need to load the textures for our type of bag, not all types. 
Closes #99
 2014-08-15 17:20:00 -07:00
CovertJaguar fbe7aca865 Revert "Merge pull request #92 from fabricator77/patch-3" 
This reverts commit 3632e6bc4e, reversing
changes made to 72c021d99d.
 2014-08-15 17:05:29 -07:00
CovertJaguar 3632e6bc4e Merge pull request #92 from fabricator77/patch-3 
Remove dead method from hive world gen.
 2014-08-15 16:52:09 -07:00
Player 72c021d99d Work around LaunchClassLoader tripping over missing IC2 classes. 2014-08-14 15:50:13 +02:00
Parker Young 487e9fb6a6 Merge pull request #93 from mezz/missingAssets 
Added assets for known missing textures
 2014-08-13 16:08:00 -04:00
SandGrainOne 5e5d788905 Updated submodule ForestryAPI 2014-08-13 22:07:35 +02:00
SandGrainOne 07b98ad150 Fixes to trade system 2014-08-13 00:32:23 +02:00
SandGrainOne 74b51cc300 Merge branch 'mezz-mailSystemFixes' 2014-08-12 23:58:31 +02:00
SandGrainOne ac6b684ca0 Merge branch 'mailSystemFixes' of git://github.com/mezz/ForestryMC into mezz-mailSystemFixes 2014-08-12 23:57:25 +02:00
SandGrainOne cd132b55c7 Updating submodule references 2014-08-12 23:23:58 +02:00
CovertJaguar af081c614f Simplify some of the backpack code and "fix" the localization code so that it isn't prefixing "Woven" in a non-localization friendly way. This is only hack fix though, all the bags will lose the "Woven" prefix entirely until Forestry is converted to the vanilla localization api. 2014-08-12 05:13:09 -07:00
CovertJaguar 54146d29b9 Removed redundant function from backpack API. All checks for item validity now use IBackpackDefinition.isItemValid() resulting in more consistent behaivor. 2014-08-12 03:47:28 -07:00
Parker 38ed2fec51 Merge branch 'master' of https://github.com/ForestryMC/ForestryMC 2014-08-12 00:46:34 -04:00
Parker ec882b1372 Updated localizations 2014-08-12 00:46:10 -04:00
JamesMitchell 5b779cfde9 Removed registration for unknown missing textures: 
textures/items/analyzer/natural.png
textures/items/misc/liquid.png
textures/items/misc/empty.png
 2014-08-11 19:45:08 -07:00
JamesMitchell 809a35025b Added assets for known missing textures: royaljelly crate and IC2 silver crate 2014-08-11 18:37:48 -07:00
Parker Young 0a0f8a4047 Merge pull request #90 from JamesMitchell/readme 
removed forum link from readme
 2014-08-11 18:03:45 -04:00
fabricator77 d788123065 Remove dead method from hive world gen. 
BlockBeehives doesn't have an onBlockPlaced method, and the vanilla method does nothing.
Perhaps junk left over from 1.7 update.
 2014-08-12 07:27:57 +09:30
JamesMitchell ec05cdc2c1 fixes for mail system. 2014-08-11 14:35:12 -07:00
Parker 8bcf3568fe Updated submodules 2014-08-11 17:17:22 -04:00
Parker Young 8b39e12cdc Merge pull request #91 from Parker8283/reformation 
Reformed Forestry!
 2014-08-11 17:07:58 -04:00
Parker 52601f02f4 Fixing merge stuffz 2014-08-11 17:03:51 -04:00
Parker 8f2d802f11 Reformed Forestry! 
* Updated for BC 6.0.x compatibility
* Re-implemented the Pipes plugin
* Converted to vanilla assets lang system
* Converted to standard gradle file structure
* General warnings cleanup
 2014-08-11 16:56:09 -04:00
JamesMitchell 9db400bb20 removed forum link from readme 2014-08-11 12:13:12 -07:00