Commit Graph
2423 Commits
Author SHA1 Message Date
TheVikingWarrior cfc523d039 Update MultiBrickItem.java 2013-11-22 14:12:44 +01:00
TheVikingWarrior cec46094ec Update CraftedSoilItemBlock.java 2013-11-22 14:10:23 +01:00
TheVikingWarrior 001a322962 Update HamboneItemBlock.java 2013-11-22 14:05:05 +01:00
TheVikingWarrior 26e85acf16 Update StrangeFood.java 2013-11-22 14:01:47 +01:00
TheVikingWarrior 73b19d1bbe Update Knapsack.java 2013-11-22 13:54:07 +01:00
TheVikingWarrior fbd493dc0b Update it_IT.lang 2013-11-22 13:31:49 +01:00
Progwml6 bd9fc15fa6 reorganize a bit 2013-11-22 06:07:45 -05:00
Progwml6 ac77676a85 maven based systems wont package api's storedd in this manner 2013-11-22 05:42:24 -05:00
mDiyo 9ecd8041d5 Fix emerald casting 2013-11-22 00:07:33 -08:00
mDiyo 969e8a3e63 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-21 23:26:39 -08:00
mDiyo 7816e67883 Melt and cast emerald blocks 2013-11-21 23:19:34 -08:00
mDiyo 1fb1702cde Merge pull request #344 from ReikaKalseki/patch-1
Update EnvironmentChecks.java
2013-11-21 22:39:25 -08:00
mDiyo 29354ba3f4 Gem cast, more misc fixes 2013-11-21 22:34:47 -08:00
Reika 4862eb7b53 Update EnvironmentChecks.java
This code was based on a misunderstanding.
2013-11-22 00:49:25 -05:00
Sunstrike 7c76f20665 Update EnvironmentChecks.java 2013-11-22 03:44:46 +00:00
Progwml6 0e7c20308d stop SS from acting like a 2 yr old 2013-11-21 19:59:31 -05:00
Progwml6 b734ade66d accidentally missed the start of comment in build file 2013-11-21 19:27:06 -05:00
Progwml6 f7ade24409 cleaned up w/ help from @AbrarSyed 2013-11-21 19:17:54 -05:00
Progwml6 dc4bbb8c4d move AT, DL CB's stuff 2013-11-21 18:47:02 -05:00
Sunstrike 248d8e74ef Oh here we go again Greggy...
Really? FML? Are you high now? :p
2013-11-21 23:42:31 +00:00
Sunstrike e5dd0d2423 Make AT active at runtime for Gradle-ised Forges. 2013-11-21 18:38:43 +00:00
mDiyo 80c7ecb3d1 Misc fixes 2013-11-21 10:10:47 -08:00
Zach 86dfcbf655 Minecraft is compiled against java 1.6 2013-11-21 12:55:11 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00
Zach e8b7378831 Update .gitignore 2013-11-21 10:56:26 -05:00
Progwml6 24307a1ea5 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-21 09:25:21 -05:00
Progwml6 51ecf7e06a remove modloader references 2013-11-21 09:25:14 -05:00
Zach 56c2de4811 Merge pull request #341 from TheVikingWarrior/patch-3
Fixed scythe head icon on the 2nd manual
2013-11-21 05:52:02 -08:00
TheVikingWarrior 612dc7dc66 Fixed scythe head icon on the 2nd manual
http://www.minecraftforum.net/topic/1659892-164tinkers-construct/page__st__6700

RichardJCox:

Second (minor): That isn't a scythe part in book 2:
2013-11-21 14:19:27 +01:00
fuj1n 30b8dd8097 Merge pull request #340 from TheVikingWarrior/patch-2
Update it_IT.lang
2013-11-21 04:43:07 -08:00
TheVikingWarrior 4b40d9704b Update it_IT.lang 2013-11-20 22:29:46 +01:00
mDiyo d16e7305c0 Null check for death event 2013-11-19 21:57:09 -08:00
mDiyo 7a8836adae Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-19 20:58:36 -08:00
mDiyo af470c518f Add pigiron, fix event crash 2013-11-19 20:57:52 -08:00
TheVikingWarrior 345a485966 Tooltip Localiztion test, DO NOT MERGE
I tried to localize theese tooltips, but i've never coded anything and i don't know if it makes any sence. But if it do (and i would be surprises), i'll do it to the other tooltips.
2013-11-19 22:39:19 +01:00
Zach d7b17f5e87 Merge pull request #337 from Vexatos/patch-3
Update de_DE.lang
2013-11-19 10:58:08 -08:00
Zach 4d954a51cc Merge pull request #338 from TheVikingWarrior/patch-2
Update it_IT.lang
2013-11-19 10:57:57 -08:00
TheVikingWarrior 5ac3766474 Update it_IT.lang 2013-11-19 16:57:00 +01:00
Progwml6 1168f0d280 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-19 03:23:57 -05:00
Progwml6 8e876bf90a prevent dupe glitch 2013-11-19 03:23:51 -05:00
Vexatos a44a36605b Update de_DE.lang 2013-11-19 07:28:55 +01:00
mDiyo 413a86f329 New tooltip for seared tanks 2013-11-18 22:23:02 -08:00
mDiyo 4d46f950d8 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-18 19:30:17 -08:00
mDiyo 7a50910c86 Molten platinum needs icons 2013-11-18 19:30:10 -08:00
fuj1n 8668b91ac5 Merge pull request #334 from Vexatos/patch-2
Update de_DE.lang
2013-11-18 13:52:31 -08:00
Vexatos 4e19bcd3d5 Oops. 2013-11-18 17:12:44 +01:00
Vexatos 6cbab9c76b Sorry for the delay...
Someone in my school decided to shutdown my PC while I was translating this file, @fuj1n
2013-11-18 17:11:28 +01:00
Zach cdd2fc4859 Merge pull request #333 from TheVikingWarrior/patch-4
Frying Pan Localization
2013-11-18 07:24:29 -08:00
TheVikingWarrior 012200dbc4 Update zh_CN.lang 2013-11-18 14:14:57 +01:00
TheVikingWarrior a104045f18 Update it_IT.lang 2013-11-18 14:10:32 +01:00