Commit Graph
2423 Commits
Author SHA1 Message Date
Zach 40ef79fa05 Merge pull request #268 from Zerokyuuni/master
I hurped
2013-10-23 13:36:53 -07:00
Zerokyuuni 67497543af I hurped
I fixed the durp
2013-10-23 16:33:17 -04:00
Progwml6 fe753269cb Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-10-23 15:58:14 -04:00
Progwml6 726350ad28 moving POM to graveyard 2013-10-23 15:57:07 -04:00
Zach d6b9663822 Merge pull request #264 from tmpillbox/master
100% more transparent
2013-10-23 12:45:21 -07:00
Zach 5ff327beed Merge pull request #267 from Zerokyuuni/master
BG API update
2013-10-23 12:44:36 -07:00
Zerokyuuni f851291fa5 BG API update
Battlegear's API has updated. And an updated shenanigan
2013-10-23 14:45:25 -04:00
Progwml6 69c0346d9e Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-10-23 13:21:21 -04:00
Progwml6 78edcbeb21 update ore dictionary name of mossystone to stoneMossy 2013-10-23 13:20:56 -04:00
Alexander Behrhof 921fa05441 Cleaning up villages 2013-10-22 22:11:04 -04:00
Sunstrike dcfcc3e7c5 Squirrel away env checks to new helper 2013-10-22 20:09:21 +01:00
Sunstrike 9a6abc31f6 Fix for blathering idiots reporting GT-related crashes.
We now correctly add an entry to crash reports during enhancement if unsupported mod(s) are located.
2013-10-22 16:49:14 +01:00
tmcgeorge d7cfe46fb8 More more transparent! Leaves 2013-10-21 23:20:40 -05:00
tmcgeorge 9748181436 Even more transparent - Crafted Soil 2013-10-21 22:44:01 -05:00
tmcgeorge 7b843a9982 100% more transparent 2013-10-21 22:34:18 -05:00
mDiyo 0239151a4c Fix missing imports in SlimeIslandGen 2013-10-21 20:27:14 -07:00
mDiyo 2dbc45837c Merge pull request #259 from Samtrion/patch-1
prevents slimeisland generation if worldtype is flat
2013-10-21 20:19:31 -07:00
mDiyo ebe8c3dc03 Merge pull request #262 from Samtrion/master
TConstruct Villager (rework)
2013-10-21 20:19:12 -07:00
samtrion 3bcc85a36a TConstruct Villager (rework)
TConstruct
Added: Registered Villager to the Spawn Egg
Fixed: Moved the TradeHandler, not nesaasry if addToVillages is false
TVillageTrades
Removed: The old implementation was too monotonous.
Added: Randomizer for each "TConstruct" Villager, now are the recipes
more random and more valueable.
2013-10-21 19:57:00 +02:00
mDiyo cd24da2765 Fix GT fix 2013-10-20 19:52:10 -07:00
mDiyo 5bf10861da Fix GregTech OreDict debug console spam 2013-10-20 19:11:49 -07:00
mDiyo 766b4cf6c3 Pure Peace 2013-10-20 18:55:22 -07:00
mDiyo 1859ceca2b Better PeaceOfMind 2013-10-20 18:36:11 -07:00
mDiyo 8f4868cf1d Better PeaceOfMind 2013-10-20 18:34:31 -07:00
mDiyo 2d2e31890c Use proper event bus 2013-10-20 17:48:12 -07:00
mDiyo 57047d9acc Re-add debug 2013-10-20 17:32:42 -07:00
mDiyo ecc15b7894 More general scanning for PeaceOfMind 2013-10-20 17:29:00 -07:00
mDiyo 21ca7e4df9 Debug for PeaceOfMind 2013-10-20 17:22:50 -07:00
mDiyo ed14e06554 Peace of mind 2013-10-20 17:05:15 -07:00
mDiyo 05fd2829e3 Fix merge conflicts 2013-10-20 08:49:35 -07:00
mDiyo 6d21a0f845 Slime islands are no longer opaque 2013-10-20 08:48:49 -07:00
Sunstrike 51fbf822b8 Slime islands now shouldn't collide with terrain.
(Unless that terrain is stupidly steep or sudden)
2013-10-20 10:39:46 +01:00
Samtrion ae9d85a411 prevents slimeisland generation if worldtype is flat 2013-10-20 11:08:38 +02:00
Arthur Uzulin b094f4dacf Fixed metadata blocks rendering as 0 in smeltery
The blocks that have texture dependent on metadata should now correctly
render in the smeltery
2013-10-20 12:34:07 +11:00
Sunstrike 9aa7c033b0 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-10-19 20:40:33 +01:00
Sunstrike 2450c177f2 Apply Vazkii's fix for a certain GUI mod. 2013-10-19 20:40:00 +01:00
Sunstrike 1d24653c4a Merge pull request #257 from TheVikingWarrior/patch-2
Update it_IT.lang
2013-10-19 09:44:56 -07:00
Sunstrike d10c93f1a3 Merge pull request #258 from Vexatos/patch-2
Update de_DE.lang
2013-10-19 09:44:40 -07:00
Vexatos 63c4ecb875 Update de_DE.lang 2013-10-19 17:06:49 +02:00
mDiyo de0a4f538c Accept invisible tank blocks as air 2013-10-19 08:02:15 -07:00
mDiyo 17503664d8 Change master flag for MultiServantLogic 2013-10-19 07:57:31 -07:00
TheVikingWarrior 32a68b05da Update it_IT.lang 2013-10-19 16:57:16 +02:00
mDiyo 38cc3fb60e Fix merge conflicts 2013-10-19 07:48:55 -07:00
mDiyo abd213038f Change fluid registration to standard 2013-10-19 07:45:16 -07:00
Progwml6 b507ea7470 note to self get better git client 2013-10-19 10:23:56 -04:00
Progwml6 a4b917eb23 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-10-19 10:02:19 -04:00
Progwml6 2c021e9f95 refactor waila plugin to reduce likelihood of crashes 2013-10-19 10:02:00 -04:00
fuj1n da95deb390 Merge pull request #256 from alexbegt/master
Updating capes to reflect new repo.
2013-10-19 06:48:03 -07:00
Progwml6 a4c2fec3df force back in lost commit of mfr plugin refactoring to reduce likelyhood of crashes 2013-10-19 09:42:15 -04:00
Alexander Behrhof a2b9d231e7 Fixing the mDiyo user being removed :) 2013-10-19 09:40:45 -04:00