Commit Graph
541 Commits
Author SHA1 Message Date
progwml6 2bc58d41b2 clean up formatting, tweak build.xml more 2013-09-30 23:54:04 -04:00
progwml6 d791b11c7b Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-09-30 23:13:15 -04:00
progwml6 5a50706768 Merge branch 'master' of github.com:progwml6/TinkersConstruct 2013-09-30 23:07:22 -04:00
progwml6 df6eaf4dfc added in FMP plugin , tested code with and without fmp installed 2013-09-30 23:07:14 -04:00
mDiyo 9a6ace2f69 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-29 19:38:43 -07:00
mDiyo 702abbb011 Smeltery Components 2013-09-29 19:38:20 -07:00
Sunstrike 24075483d1 Add support clause to license block.
To protect ourselves against any backlash for shoving away modpack-related bugs, we're now making modpack owners responsable for support. Also, please no more 1.5.x backport requests D:
2013-09-29 21:28:47 +01:00
Sunstrike 9c0b234d26 Merge pull request #204 from logomaster256/master
Misc things
2013-09-29 11:19:55 -07:00
logomaster256 ca02a13337 Added clear glass to the ore dict 2013-09-29 19:42:19 +02:00
mDiyo 4747afabe7 Update IC2 API, only include needed parts 2013-09-29 09:38:04 -07:00
mDiyo def4228813 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-29 09:05:47 -07:00
mDiyo bdd2701368 Fix version check for structures, begin AdaptiveSmelteryLogic 2013-09-29 09:05:08 -07:00
Arthur Uzulin 347bc37c48 Clear glass + Meta 15 = no-connect 2013-09-29 23:56:33 +10:00
logomaster256 364c564569 Added toolpart.ToolShard to en_US.xml, added casting recipe for the seared brick item using the ingot cast
If you click on a liquid in the smeltery gui it will go to the bottom and if you shift click it, it will go to the top
2013-09-29 14:15:06 +02:00
fuj1n e79846cbd3 Fixed cape-related stacktrace in the console 2013-09-29 19:31:18 +10:00
fuj1n 5f6fe5f0c5 Finalised capes.txt
From this point forward, only allow the removal of capes, no other changes or additions. (Tinker's Devs excepted)
2013-09-29 16:22:22 +10:00
Zach e2f785f25f Merge pull request #207 from progwml6/master
make sure the ic2 api is not packaged in order to prevent crashes
2013-09-28 23:16:28 -07:00
Progwml6 bb81a9af7a make sure the ic2 api is not packaged in order to prevent crashes 2013-09-29 02:14:10 -04:00
mDiyo b15d53886e Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-28 21:10:39 -07:00
mDiyo c79402563c Finish world scanning on AdaptiveInventoryLogic 2013-09-28 21:10:13 -07:00
mDiyo 0357ec615a Merge pull request #206 from andrejsavikin/patch-1
Update capes.txt
2013-09-28 17:50:03 -07:00
mDiyo 0630c3b661 Merge pull request #203 from maexono/master
Make arrows fire from dispensers as projectiles
2013-09-28 17:49:29 -07:00
andrejsavikin 9c702ae49c Update capes.txt
Changing my boring blue cape to fuj1n's awesome cape(stealing fuj1n's cape)
2013-09-29 00:19:55 +02:00
mDiyo 903a3238c3 Lower required Forge version 2013-09-28 08:57:43 -07:00
mDiyo 5de6661859 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-28 08:45:57 -07:00
mDiyo 363f1a8198 Add recipes for re-staining clear glass, attempt at backwards compatibility for village structures 2013-09-28 08:45:28 -07:00
Sunstrike b01b2e7d6c Update capes.txt 2013-09-28 04:15:28 +01:00
mDiyo ea484dce6d Update capes.txt 2013-09-27 18:57:09 -07:00
Max Teegen b2cff48afd Proper code formatting. 2013-09-27 18:31:50 +02:00
Max Teegen 5ef60caf03 Merge branch 'master' of https://github.com/maexono/TinkersConstruct 2013-09-27 18:30:49 +02:00
Max Teegen d83785ada6 Implemented dispenser behavior for firing arrows. 2013-09-27 18:29:20 +02:00
Max Teegen f5faf4321e Implemented dispenser behavior for firing arrows. 2013-09-27 18:25:58 +02:00
Arthur Uzulin abdd27c235 "Tsuki no me" almost complete
Becomes super apparent what project "Tsuki no me" is about
2013-09-26 15:23:06 +10:00
Arthur Uzulin 21a611ea02 More stuff on "Tsuki no me" 2013-09-24 21:16:00 +10:00
Arthur Uzulin e94cf46b95 For the sake of legacy compatibility 2013-09-24 16:43:44 +10:00
mDiyo 4dc8657841 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-23 23:28:45 -07:00
mDiyo 15cda37162 Remove sidedness on Smeltery Drains 2013-09-23 23:28:15 -07:00
Arthur Uzulin 02a08e06bd Disabled AdvancedDrawbridgeLogic code to...
...prevent build failures
2013-09-24 14:07:15 +10:00
Arthur Uzulin 7b7bea76c3 Started works on advanced drawbridge
(Currently not ready to become a block yet, or else may be crashy)
2013-09-24 13:39:21 +10:00
Arthur Uzulin e0926abb56 Improved drawbridge logic 2013-09-24 13:16:29 +10:00
mDiyo d509d48675 Fix crash when drawbridge is placed in drawbridge camo slot 2013-09-23 06:43:10 -07:00
mDiyo 7ba7c1fcf1 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-23 06:15:08 -07:00
mDiyo fc2cd3bdbd Prevent checking in TContent 2013-09-23 06:14:27 -07:00
mDiyo 8ac30c541e Initial multi-block detection in AdaptiveInventoryLogic 2013-09-23 06:12:02 -07:00
Progwml6 3c85f3bba0 remove un needed AT entry 2013-09-21 16:04:26 -04:00
Progwml6 f8de092f6a Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-09-21 16:03:19 -04:00
Sunstrike 9d048662af Merge pull request #199 from Zerokyuuni/master
Tasty Nugget
2013-09-21 08:57:00 -07:00
Zerokyuuni 6584a6c036 Tasty Nugget
Pigiron nuggets are tasty
2013-09-21 11:51:21 -04:00
Progwml6 ffd46ea0ea Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-09-21 10:12:52 -04:00
mDiyo 10f04a6534 Update Smeltery Blood to new fluid system 2013-09-21 06:14:11 -07:00