Commit Graph
2423 Commits
Author SHA1 Message Date
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
Arthur Uzulin ec74ded4f1 Added comment support for capes.txt parser
Fixes a syntax error on line 51 in the console.
2013-10-08 22:25:50 +11:00
Arthur Uzulin 56e975335e Prevent breaking of tank air blocks in creative + survival 2013-10-08 21:27:21 +11:00
fuj1n 0213cd9206 Merge pull request #235 from Vexatos/master 2013-10-08 03:19:46 -07:00
Vexatos 2b40960068 Added armor. 2013-10-08 12:18:40 +02:00
Arthur Uzulin 7076c78782 Merge branch 'armor' of https://github.com/mDiyo/TinkersConstruct 2013-10-08 21:08:46 +11:00
mDiyo 6a7b576deb Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-10-07 20:50:40 -07:00
mDiyo f5b939d8ce Smeltery Gigantus activate! 2013-10-07 20:49:55 -07:00
Sunstrike 8a4c85a51b Revert "Change derpy faucet behaviour."
Reverting due to issues that I currently do not have time to fix.
2013-10-07 19:58:36 +01:00
Progwml6 10101a6561 add Italian translation to list of languages loaded 2013-10-07 00:36:03 -04:00
mDiyo f59ddceebc Merge pull request #229 from progwml6/master
update thaumium support by upating the location of the necessary config ...
2013-10-06 20:54:55 -07:00
Progwml6 c50a1b3d29 update thaumium support by upating the location of the necessary config in Thaumcraft 4 2013-10-06 23:53:35 -04:00
mDiyo 8ce8565490 Fix gui on Smeltery 2013-10-06 16:18:19 -07:00
mDiyo 21f298f064 Proper default on slime island rarity 2013-10-06 11:01:09 -07:00
mDiyo 146cc6c65b Fix Tool Station Gui 2013-10-06 10:54:46 -07:00
mDiyo 2ffa646f85 Choose the right folder for IC2 items 2013-10-06 10:14:33 -07:00
mDiyo f92af7cc68 Change to internal reflection for accessing IC2 itemstacks 2013-10-06 09:53:48 -07:00
mDiyo 26fb95de90 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-10-06 09:46:46 -07:00
Sunstrike 135ffc2b4e Remove Preloader experimental blacklist. 2013-10-06 17:46:23 +01:00
mDiyo 780dfe1e73 Dont break the Smeltery yet, really! 2013-10-06 09:46:22 -07:00
mDiyo 4f34799c2b Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-10-06 09:26:20 -07:00
mDiyo 6f3daa1a28 Update version number to stable 2013-10-06 09:25:41 -07:00
mDiyo 4cd2d07d4c Remove MFR support 2013-10-06 09:24:58 -07:00
Sunstrike 635632bc65 Pretty sure it'll work this time. Closes #222. 2013-10-06 16:50:22 +01:00
Sunstrike f728a2b7b1 REALLY blacklist MFR. Derp. Closes #222 FOR REALS this time. 2013-10-06 16:42:14 +01:00
Sunstrike a6d01d80fa Blacklist MFR plugin from Preloader. Closes #222. 2013-10-06 16:00:49 +01:00