Commit Graph
648 Commits
Author SHA1 Message Date
Zach 09edaac07f Merge pull request #249 from TheVikingWarrior/patch-1
Update it_IT.lang
2013-10-16 21:29:22 -07:00
TheVikingWarrior 0bc48375ab Update it_IT.lang 2013-10-16 19:00:53 +02:00
Arthur Uzulin aa810a2aa1 Improved tool part localization 2013-10-16 17:38:02 +11:00
Sunstrike b0f0a12ae9 Reduce max recursion count. (Hopefully) closes #248. 2013-10-15 21:14:23 +01:00
Sunstrike 2526548206 Merge pull request #247 from TheVikingWarrior/patch-1
Update it_IT.lang
2013-10-14 12:28:45 -07:00
TheVikingWarrior e25d97ff09 Update it_IT.lang 2013-10-14 21:27:50 +02:00
fuj1n bb6354dcd9 Merge pull request #246 from Vexatos/patch-1
Update de_DE.lang
2013-10-14 03:48:51 -07:00
Vexatos b78348e4fc Update en_US.lang 2013-10-14 12:44:52 +02:00
Vexatos c677fa0c46 Update de_DE.lang 2013-10-14 12:44:39 +02:00
Arthur Uzulin caa7bb9c5b Add pattern/cast names to en_US.lang 2013-10-14 20:41:14 +11:00
Progwml6 65590e3523 Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-14 01:38:09 -04:00
Progwml6 1db06b4e50 more fixes 2013-10-14 01:37:40 -04:00
Progwml6 4d8f94ac2f allow access to smelterycomponent via adaptivesmeltery logic, and add in some stuff necessary to fixing gui
restored fuel section of the gui to full function, partial function to the fluid section
2013-10-14 00:20:56 -04:00
Sunstrike 79b3941fed Merge pull request #245 from TheVikingWarrior/patch-1
(it_IT) Added ladder
2013-10-13 12:03:55 -07:00
TheVikingWarrior beb19eb9b5 Added Ladder 2013-10-13 21:02:42 +02:00
Sunstrike 86ae9f221a Merge pull request #244 from Vexatos/master
(de_DE) Added ladder.
2013-10-13 10:19:14 -07:00
Vexatos 5043e1cf51 Added ladder. 2013-10-13 19:03:15 +02:00
Arthur Uzulin 741dd0a3b8 Worked on the GUI of the advanced drawbridge 2013-10-13 15:12:15 +11:00
Progwml6 4a5757bf1f Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-12 23:31:30 -04:00
Progwml6 1c93a8fba7 remove random console spam logging 2013-10-12 23:31:08 -04:00
Arthur Uzulin 55588400ce Fixed crafting station-hopper dupe bug 2013-10-13 13:55:45 +11:00
Progwml6 8f7a40bb5f Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-12 22:23:51 -04:00
Arthur Uzulin 32ccf02784 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-10-13 13:23:13 +11:00
Arthur Uzulin 7a8c63d647 Fixed a possible NPE in casting basins/tables 2013-10-13 13:22:39 +11:00
Progwml6 b6771c38ff Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-12 21:39:43 -04:00
Sunstrike 76513831e5 Accidentally edited IC2 API. Reverted. 2013-10-12 23:49:36 +01:00
Sunstrike 5c043d66f4 Convert to Java logging framework. Closes #227. 2013-10-12 23:46:35 +01:00
Progwml6 238aa94da9 Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-12 14:49:25 -04:00
Sunstrike 9bdbd6c6f1 Add recipe for stone ladder 2013-10-12 15:40:56 +01:00
Sunstrike b2edbd816d Implement stone ladder 2013-10-12 15:33:35 +01:00
Arthur Uzulin 7530d0d151 Fixed a rare/possible null pointer exception 2013-10-12 17:59:26 +11:00
Progwml6 9694997d75 Merge branch 'master' of github.com:progwml6/TinkersConstruct 2013-10-11 17:05:25 -04:00
Sunstrike b85a607ee4 Stone Ladder texture 2013-10-11 13:00:07 +01:00
progwml6 9ad71df07e Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-10 21:28:50 -04:00
Arthur Uzulin e013079fec Added a null check to tank air block 2013-10-10 21:34:22 +11:00
mDiyo 8b76a0ffe8 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-10-10 02:05:11 -07:00
mDiyo b99c98a81c Garbled Gui, but readable 2013-10-10 02:04:36 -07:00
Arthur Uzulin 640eb3c977 Wooden armor + armor cast recipes 2013-10-10 20:04:18 +11:00
mDiyo aff47e34f1 Add null check to loading liquids in the Smeltery 2013-10-10 00:55:50 -07:00
mDiyo de79479944 Render, Sync Smeltery 2013-10-10 00:51:38 -07:00
mDiyo 3b9b803aad Smeltery Gigantus drains function properly 2013-10-09 22:21:19 -07:00
Sunstrike 9287a46dc2 Remove deprecated language loader 2013-10-09 11:29:10 +01:00
Sunstrike 720c5b700e Convert language files 2013-10-09 11:28:41 +01:00
Sunstrike b15e424043 Merge pull request #238 from TheVikingWarrior/patch-2
Update it_IT.xml
2013-10-09 00:53:05 -07:00
TheVikingWarrior 03469a2972 Update it_IT.xml
Added armour patterns and some tweaks
2013-10-09 08:33:22 +02:00
fuj1n 78de048d7c Merge pull request #236 from progwml6/master
remove unused  BOP api, add in waila to cleanout list
2013-10-08 23:01:09 -07:00
Sunstrike 0541a48c58 Update AE Spatial-IO registration.
Now with more Smeltery Gigantus!
2013-10-08 21:19:13 +01:00
Progwml6 0edb74bbaf Revert "add Italian translation to list of languages loaded"
This reverts commit 10101a6561.
2013-10-08 13:19:43 -04:00
Progwml6 21cfffc597 remove unused BOP API, add in waila to pre-run source cleaning w/ other API's 2013-10-08 13:18:26 -04:00
Progwml6 f2535c7a88 Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-10-08 13:15:15 -04:00