From 68202792b67680da0154ef1e8abb899dca4a2f99 Mon Sep 17 00:00:00 2001 From: samtrion Date: Mon, 28 Oct 2013 22:41:46 +0100 Subject: [PATCH 01/23] Fix: Server Issue with NEI --- src/tconstruct/plugins/nei/NotEnoughItems.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/plugins/nei/NotEnoughItems.java b/src/tconstruct/plugins/nei/NotEnoughItems.java index 53e87c7d..b1734362 100644 --- a/src/tconstruct/plugins/nei/NotEnoughItems.java +++ b/src/tconstruct/plugins/nei/NotEnoughItems.java @@ -4,8 +4,6 @@ import cpw.mods.fml.common.*; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; -import tconstruct.common.TContent; -import tconstruct.plugins.fmp.register.RegisterWithFMP; @Mod(modid = "TConstruct|NotEnoughItems", name = "TConstruct Compat: NEI", version = "0.1", dependencies = "after:NotEnoughItems;after:TConstruct") @NetworkMod(clientSideRequired = false, serverSideRequired = false) @@ -14,6 +12,9 @@ public class NotEnoughItems @EventHandler public static void load (FMLInitializationEvent ev) { + if (ev.getSide().isServer()) + return; + if (!Loader.isModLoaded("NotEnoughItems")) { FMLLog.warning("NotEnoughItems missing - TConstruct Compat: NEI not loading."); From fe76c424bf19e379d3918814d71287a81ec9c3d8 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Mon, 28 Oct 2013 22:39:30 +0000 Subject: [PATCH 02/23] Delete aksnc What even -was- that? --- aksnc | 4580 --------------------------------------------------------- 1 file changed, 4580 deletions(-) delete mode 100644 aksnc diff --git a/aksnc b/aksnc deleted file mode 100644 index 66f7a7ae..00000000 --- a/aksnc +++ /dev/null @@ -1,4580 +0,0 @@ -commit 05fd2829e3c1f89f40e8177d6a341dc56b055109 -Merge: 6d21a0f 51fbf82 -Author: mDiyo -Date: Sun Oct 20 08:49:35 2013 -0700 - - Fix merge conflicts - -commit 6d21a0f845a0f518eb02d5b262684feed643563d -Author: mDiyo -Date: Sun Oct 20 08:48:49 2013 -0700 - - Slime islands are no longer opaque - -commit 51fbf822b8696870a6d687e65372279a7236ddd7 -Author: Sunstrike -Date: Sun Oct 20 10:39:46 2013 +0100 - - Slime islands now shouldn't collide with terrain. - - (Unless that terrain is stupidly steep or sudden) - -commit b094f4dacfaa312ecd488e85a38d6ecfb4ff4fa3 -Author: Arthur Uzulin -Date: Sun Oct 20 12:33:42 2013 +1100 - - Fixed metadata blocks rendering as 0 in smeltery - - The blocks that have texture dependent on metadata should now correctly - render in the smeltery - -commit 9aa7c033b0ace8e70c4386ba9514e359ce27ab4d -Merge: 2450c17 1d24653 -Author: Sunstrike -Date: Sat Oct 19 20:40:33 2013 +0100 - - Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct - -commit 2450c177f21334c264ff75c2e26a659a4f2f64da -Author: Sunstrike -Date: Sat Oct 19 20:40:00 2013 +0100 - - Apply Vazkii's fix for a certain GUI mod. - -commit 1d24653c4ac0ec04f1f594ead29ce4f5903a2dbc -Merge: d10c93f 32a68b0 -Author: Sunstrike -Date: Sat Oct 19 09:44:56 2013 -0700 - - Merge pull request #257 from TheVikingWarrior/patch-2 - - Update it_IT.lang - -commit d10c93f1a3e4b26600978dd54dea3baad7d7b4b6 -Merge: de0a4f5 63c4ecb -Author: Sunstrike -Date: Sat Oct 19 09:44:40 2013 -0700 - - Merge pull request #258 from Vexatos/patch-2 - - Update de_DE.lang - -commit 63c4ecb87582443a8d8639e06440fa4d2ab24b19 -Author: Vexatos -Date: Sat Oct 19 17:06:49 2013 +0200 - - Update de_DE.lang - -commit de0a4f538c43e2e8286fd7522e5f6097bc420980 -Author: mDiyo -Date: Sat Oct 19 08:02:15 2013 -0700 - - Accept invisible tank blocks as air - -commit 17503664d8b3d845e745920532ac328b105ac50f -Author: mDiyo -Date: Sat Oct 19 07:57:31 2013 -0700 - - Change master flag for MultiServantLogic - -commit 32a68b05da177a5430bab8ec4e7e7afd7a06e348 -Author: TheVikingWarrior -Date: Sat Oct 19 16:57:16 2013 +0200 - - Update it_IT.lang - -commit 38cc3fb60e8ac2746d479bbfeb85f57292136b4d -Merge: abd2130 b507ea7 -Author: mDiyo -Date: Sat Oct 19 07:48:55 2013 -0700 - - Fix merge conflicts - -commit abd213038fe0e5b0fafccc6efc6d5cd7d0bcbf5a -Author: mDiyo -Date: Sat Oct 19 07:45:16 2013 -0700 - - Change fluid registration to standard - -commit b507ea7470927b9bff3480ca8a4285be661648ff -Author: Progwml6 -Date: Sat Oct 19 10:23:56 2013 -0400 - - note to self get better git client - -commit a4b917eb232067025eed90dcd2315354d5997e6a -Merge: 2c021e9 da95deb -Author: Progwml6 -Date: Sat Oct 19 10:02:19 2013 -0400 - - Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct - -commit 2c021e9f95f077f04938768894c3af6bd76b6dbc -Author: Progwml6 -Date: Sat Oct 19 10:02:00 2013 -0400 - - refactor waila plugin to reduce likelihood of crashes - -commit da95deb390d4aa4aa3105ac1a83a0d715d46f441 -Merge: a4c2fec a2b9d23 -Author: fuj1n -Date: Sat Oct 19 06:48:03 2013 -0700 - - Merge pull request #256 from alexbegt/master - - Updating capes to reflect new repo. - -commit a4c2fec3dfac8f30dce58e6b96d8fe1ebe89ea07 -Author: Progwml6 -Date: Sat Oct 19 09:42:15 2013 -0400 - - force back in lost commit of mfr plugin refactoring to reduce likelyhood of crashes - -commit a2b9d231e72a509297cbf066c722bc5b865c5518 -Author: Alexander Behrhof -Date: Sat Oct 19 09:40:45 2013 -0400 - - Fixing the mDiyo user being removed :) - -commit 830926e9c48b929171dce629f0b200d6cf85ab35 -Author: Alexander Behrhof -Date: Sat Oct 19 09:39:21 2013 -0400 - - Update capes to reflect new repo. - -commit acf16da0b262da077fc87392a68fbde85689896e -Merge: 76d6544 6f69329 -Author: Progwml6 -Date: Sat Oct 19 09:10:26 2013 -0400 - - Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct - -commit 6f6932989e9e69c92f631906bb1e1ae0a71c210f -Author: Sunstrike -Date: Sat Oct 19 14:07:28 2013 +0100 - - Update mcmod.info to reflect new repo - -commit c7938cc714ef4493dfdbe36b2960fc42e39dca50 -Author: Arthur Uzulin -Date: Sat Oct 19 23:20:57 2013 +1100 - - FluidRenderProperties for creating armor casts - -commit 1115fe8c7d23358eb77ce802bb711dd85ff125ae -Author: Arthur Uzulin -Date: Sat Oct 19 22:55:38 2013 +1100 - - Improved fluid height calculation expression... - - ...to properly respect maxHeight - -commit 1fadcfbf594547f4d136ab7c121485c55570ebe1 -Author: Sunstrike -Date: Sat Oct 19 10:55:11 2013 +0100 - - Blacklist Plugins from Preloader. - -commit 76d6544966276508d6700201aaa8479599993daa -Author: Progwml6 -Date: Sat Oct 19 03:36:39 2013 -0400 - - re-organize MFR plugin to reduce likelyhood of crashes if preloader derps - -commit ae5dd4ea4745498c57b7bc95483eacd113bb5dc1 -Author: Arthur Uzulin -Date: Sat Oct 19 18:32:41 2013 +1100 - - Various fixes/changes - - - Return false for isAirBlock in TankAirBlock(fixes ability to replace - the blocks with lava/water) - - Changed tankAir material from Material.air to Material.leaves(fixes - ability to replace the blocks with lava/water) - - Clean up imports in TankLayerScan removing the import for - scala.compat.Platform$ (fixes crash when there is no scala library) - - Add wooden armor recipes - -commit 711bfde22f9ec2a3146ce0787e5802ba5934353c -Author: Progwml6 -Date: Fri Oct 18 21:26:53 2013 -0400 - - put back MFR support using version from @skyboy - -commit 071029afb19e4442167261dd11f8eb4fe2c20082 -Merge: 6a0ecab cc905b6 -Author: Progwml6 -Date: Fri Oct 18 18:10:44 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 6a0ecab0e48f393bd36ae517e8a00fd1b0c8d999 -Author: Progwml6 -Date: Fri Oct 18 18:10:18 2013 -0400 - - we dont want GT errors ever, wording from sunstrike - -commit cc905b63a5f756a367175f6c1475393f79f50db8 -Author: Arthur Uzulin -Date: Sat Oct 19 08:48:11 2013 +1100 - - Localized wooden armor - -commit fa94af0c54559ccf7c964e3cc932506caae67c8b -Author: Sunstrike -Date: Fri Oct 18 21:05:59 2013 +0100 - - Fix derp in readNetworkNBT for layer scan - -commit d35d9d07400ffc3e33823a8d8f47babe31467997 -Author: Sunstrike -Date: Fri Oct 18 17:43:13 2013 +0100 - - Fix chunk boundary rendering quirk. - -commit 105c188167a1623ce13a93efeee388e3d79485b8 -Author: Sunstrike -Date: Fri Oct 18 16:29:21 2013 +0100 - - Make debuggable TankLayerScan an env var, suppress unchecked warning. - -commit 27bd056f57b031c9e47114f450b6a3ab27b55508 -Author: Sunstrike -Date: Fri Oct 18 16:02:34 2013 +0100 - - Begone magic numbers! Change 4000 reference to MAX_LAYER_RECURSION_DEPTH. - -commit ebb2ae15a6fdd1ea0700865daabdf904fbaf9709 -Merge: 4f9c22c 7a99157 -Author: mDiyo -Date: Fri Oct 18 05:53:48 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 4f9c22cb8ebd95dd0e128e82b80d8febfc4d87c1 -Author: mDiyo -Date: Fri Oct 18 05:53:35 2013 -0700 - - Send Smeltery inventory over the network - -commit 7a991571bec2b5c2ad434797f4cad5466cd30cd3 -Author: Sunstrike -Date: Fri Oct 18 12:30:38 2013 +0100 - - Don't crash when Seared items are put in the new smeltery... - -commit 1b2dda831674857816de2dec925c929214a569ba -Author: Sunstrike -Date: Thu Oct 17 20:54:27 2013 +0100 - - Fix 32-bit crapness in TankLayerScan. - -commit a3a8ba0158ebb604afa954584b7f67e36bb444c0 -Merge: 09edaac b387a95 -Author: Zach -Date: Thu Oct 17 11:12:28 2013 -0700 - - Merge pull request #250 from Vexatos/master - - Updated German Translation. - -commit b387a954da4be7117d8c9ca09f2085afc765f491 -Author: Vexatos -Date: Thu Oct 17 19:38:02 2013 +0200 - - Updated German Translation. - - Thank you, @fuj1n. - -commit 09edaac07faffc69a9ee5764f70bddd1c4ea01cf -Merge: aa810a2 0bc4837 -Author: Zach -Date: Wed Oct 16 21:29:22 2013 -0700 - - Merge pull request #249 from TheVikingWarrior/patch-1 - - Update it_IT.lang - -commit 0bc48375abaf4e0d0a9389869dd2352b380003d3 -Author: TheVikingWarrior -Date: Wed Oct 16 19:00:53 2013 +0200 - - Update it_IT.lang - -commit aa810a2aa1807a1482adfb41e5e05d6aae2ca974 -Author: Arthur Uzulin -Date: Wed Oct 16 17:37:33 2013 +1100 - - Improved tool part localization - -commit b0f0a12ae9f4eab1bd8dc0945ef71b050780097f -Author: Sunstrike -Date: Tue Oct 15 21:14:23 2013 +0100 - - Reduce max recursion count. (Hopefully) closes #248. - -commit 25265482063652553cc6a44596677969f03e00f6 -Merge: bb6354d e25d97f -Author: Sunstrike -Date: Mon Oct 14 12:28:45 2013 -0700 - - Merge pull request #247 from TheVikingWarrior/patch-1 - - Update it_IT.lang - -commit e25d97ff097a68312e21cab5c738ab32fbb24bcf -Author: TheVikingWarrior -Date: Mon Oct 14 21:27:50 2013 +0200 - - Update it_IT.lang - -commit bb6354dcd969e4bde67b5cb6d8a675b785dabe5e -Merge: caa7bb9 b78348e -Author: fuj1n -Date: Mon Oct 14 03:48:51 2013 -0700 - - Merge pull request #246 from Vexatos/patch-1 - - Update de_DE.lang - -commit b78348e4fcb2609423e74a74e4646610b48ff6a3 -Author: Vexatos -Date: Mon Oct 14 12:44:52 2013 +0200 - - Update en_US.lang - -commit c677fa0c461d2692899f9ca381ca1965a933a7c5 -Author: Vexatos -Date: Mon Oct 14 12:44:39 2013 +0200 - - Update de_DE.lang - -commit caa7bb9c5bf988070cf4c48ba4f0e255d4a94d55 -Author: Arthur Uzulin -Date: Mon Oct 14 20:41:14 2013 +1100 - - Add pattern/cast names to en_US.lang - -commit 65590e35239f95dc1ca5a61f68dc686bc7fd760c -Merge: 1db06b4 79b3941 -Author: Progwml6 -Date: Mon Oct 14 01:38:09 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 1db06b4e5068b2057871b0c39a03a51089cd17e6 -Author: Progwml6 -Date: Mon Oct 14 01:37:40 2013 -0400 - - more fixes - -commit 4d8f94ac2fe4db38a9324c286c8876be613dd8d4 -Author: Progwml6 -Date: Mon Oct 14 00:20:56 2013 -0400 - - 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 - -commit 79b3941fedf4a5e1361cd5220913832eb4120e87 -Merge: 86ae9f2 beb19eb -Author: Sunstrike -Date: Sun Oct 13 12:03:55 2013 -0700 - - Merge pull request #245 from TheVikingWarrior/patch-1 - - (it_IT) Added ladder - -commit beb19eb9b52f9087f38894abb49cacd6f6e57c44 -Author: TheVikingWarrior -Date: Sun Oct 13 21:02:42 2013 +0200 - - Added Ladder - -commit 86ae9f221a02e593a0de735e7baab8ffe8969fc7 -Merge: 741dd0a 5043e1c -Author: Sunstrike -Date: Sun Oct 13 10:19:14 2013 -0700 - - Merge pull request #244 from Vexatos/master - - (de_DE) Added ladder. - -commit 5043e1cf51307b37def883e8d7c73b56e0e8306e -Author: Vexatos -Date: Sun Oct 13 19:03:15 2013 +0200 - - Added ladder. - -commit 741dd0a3b8972a598975787ee8c69edcb248024f -Author: Arthur Uzulin -Date: Sun Oct 13 15:11:28 2013 +1100 - - Worked on the GUI of the advanced drawbridge - -commit 4a5757bf1fe23dc9b1e652db628417c6b6fe9317 -Merge: 1c93a8f 5558840 -Author: Progwml6 -Date: Sat Oct 12 23:31:30 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 1c93a8fba70b56e1e907c0497e7b48f135a531e9 -Author: Progwml6 -Date: Sat Oct 12 23:31:08 2013 -0400 - - remove random console spam logging - -commit 55588400cef583947c77ed51cf97f88247b9087a -Author: Arthur Uzulin -Date: Sun Oct 13 13:55:45 2013 +1100 - - Fixed crafting station-hopper dupe bug - -commit 8f7a40bb5f580203e54122daecfcc9d328aaf251 -Merge: b6771c3 32ccf02 -Author: Progwml6 -Date: Sat Oct 12 22:23:51 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 32ccf02784ee55d396f87d315ee5ea9d46a96b6d -Merge: 7a8c63d 7651383 -Author: Arthur Uzulin -Date: Sun Oct 13 13:23:13 2013 +1100 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 7a8c63d6473c1c3f9126ea4dcef8b5d5db4aedea -Author: Arthur Uzulin -Date: Sun Oct 13 13:22:39 2013 +1100 - - Fixed a possible NPE in casting basins/tables - -commit b6771c38ff6a74f2826d498d3a7b734378d214a0 -Merge: 238aa94 7651383 -Author: Progwml6 -Date: Sat Oct 12 21:39:43 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 76513831e5448f60060d3bca298b4ad8c43ef94a -Author: Sunstrike -Date: Sat Oct 12 23:49:36 2013 +0100 - - Accidentally edited IC2 API. Reverted. - -commit 5c043d66f43d077635dda32758b57f5bd792f3b9 -Author: Sunstrike -Date: Sat Oct 12 23:46:35 2013 +0100 - - Convert to Java logging framework. Closes #227. - -commit 238aa94da9de814cb6d8f85771399c85d8b3294b -Merge: 9694997 9bdbd6c -Author: Progwml6 -Date: Sat Oct 12 14:49:25 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 9bdbd6c6f17d4e88d24f5db516eab395cbfc6b02 -Author: Sunstrike -Date: Sat Oct 12 15:40:56 2013 +0100 - - Add recipe for stone ladder - -commit b2edbd816d1c90ff78fa2a08756f4331e09144c0 -Author: Sunstrike -Date: Sat Oct 12 15:33:35 2013 +0100 - - Implement stone ladder - -commit 7530d0d1516ae14bb0607e14ca8fad509244567d -Author: Arthur Uzulin -Date: Sat Oct 12 17:59:02 2013 +1100 - - Fixed a rare/possible null pointer exception - -commit 9694997d75291910bc1131ac13c40d111b2c8edc -Merge: b85a607 9ad71df -Author: Progwml6 -Date: Fri Oct 11 17:05:25 2013 -0400 - - Merge branch 'master' of github.com:progwml6/TinkersConstruct - -commit b85a607ee4b4e42efe168ca306a4e12d453a6e5e -Author: Sunstrike -Date: Fri Oct 11 13:00:07 2013 +0100 - - Stone Ladder texture - -commit 9ad71df07ef45b603c802e5af5c91e6bd2f79489 -Merge: 61acdc7 e013079 -Author: progwml6 -Date: Thu Oct 10 21:28:50 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit e013079fec91bfbf0ddbd0722da45ba84abe566b -Author: Arthur Uzulin -Date: Thu Oct 10 21:34:22 2013 +1100 - - Added a null check to tank air block - -commit 8b76a0ffe8e959993d815452f643fce66c5ae5de -Merge: b99c98a 640eb3c -Author: mDiyo -Date: Thu Oct 10 02:05:11 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit b99c98a81c65b8938fdac412057804fd3a82017b -Author: mDiyo -Date: Thu Oct 10 02:04:36 2013 -0700 - - Garbled Gui, but readable - -commit 640eb3c977375c523f6701307b59b6aba0783fdb -Author: Arthur Uzulin -Date: Thu Oct 10 20:03:45 2013 +1100 - - Wooden armor + armor cast recipes - -commit aff47e34f14fadb68a63537df19b4b50b13f61a2 -Author: mDiyo -Date: Thu Oct 10 00:55:50 2013 -0700 - - Add null check to loading liquids in the Smeltery - -commit de79479944aa48f0a7c868873835be8d0a6e6fe3 -Author: mDiyo -Date: Thu Oct 10 00:51:38 2013 -0700 - - Render, Sync Smeltery - -commit 3b9b803aadb73a3f9c2f311decbb111278050211 -Author: mDiyo -Date: Wed Oct 9 22:21:19 2013 -0700 - - Smeltery Gigantus drains function properly - -commit 9287a46dc2982586fa2a7f82d31615bff962e6ee -Author: Sunstrike -Date: Wed Oct 9 11:29:10 2013 +0100 - - Remove deprecated language loader - -commit 720c5b700edaab8415c0d6472387f7b7159773c9 -Author: Sunstrike -Date: Wed Oct 9 11:28:41 2013 +0100 - - Convert language files - -commit b15e424043ffe8c45227409d3600af48e3673b47 -Merge: 78de048 03469a2 -Author: Sunstrike -Date: Wed Oct 9 00:53:05 2013 -0700 - - Merge pull request #238 from TheVikingWarrior/patch-2 - - Update it_IT.xml - -commit 03469a297256884529d5ce016bd7156919433a28 -Author: TheVikingWarrior -Date: Wed Oct 9 08:33:22 2013 +0200 - - Update it_IT.xml - - Added armour patterns and some tweaks - -commit 78de048d7cefe6eea84544522c38c56494146d0c -Merge: 0541a48 0edb74b -Author: fuj1n -Date: Tue Oct 8 23:01:09 2013 -0700 - - Merge pull request #236 from progwml6/master - - remove unused BOP api, add in waila to cleanout list - -commit 0541a48c5840a7fc7e80e46dc19442bb712dfaaa -Author: Sunstrike -Date: Tue Oct 8 21:19:13 2013 +0100 - - Update AE Spatial-IO registration. - - Now with more Smeltery Gigantus! - -commit 0edb74bbafffe2add22e41a9d34075582eda35f1 -Author: Progwml6 -Date: Tue Oct 8 13:19:43 2013 -0400 - - Revert "add Italian translation to list of languages loaded" - - This reverts commit 10101a6561794953aca443aedf79cd5efe669074. - -commit 21cfffc5978ac1030ed01168169132219fc871c0 -Author: Progwml6 -Date: Tue Oct 8 13:18:26 2013 -0400 - - remove unused BOP API, add in waila to pre-run source cleaning w/ other API's - -commit f2535c7a881c71837254d165ebb56407445ef39b -Merge: 10101a6 ec74ded -Author: Progwml6 -Date: Tue Oct 8 13:15:15 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit ec74ded4f1752f5ad9fa5be5a7f32b591e424bb3 -Author: Arthur Uzulin -Date: Tue Oct 8 22:25:50 2013 +1100 - - Added comment support for capes.txt parser - - Fixes a syntax error on line 51 in the console. - -commit 56e975335e0bad7bb1fd3a427b250bf4e478fa34 -Author: Arthur Uzulin -Date: Tue Oct 8 21:27:03 2013 +1100 - - Prevent breaking of tank air blocks in creative + survival - -commit 0213cd92065663b7f38aa148529e1bb0eda69585 -Merge: 7076c78 2b40960 -Author: fuj1n -Date: Tue Oct 8 03:19:46 2013 -0700 - - Merge pull request #235 from Vexatos/master - -commit 2b40960068be5e44cba9d47380b76637b95b7591 -Author: Vexatos -Date: Tue Oct 8 12:18:40 2013 +0200 - - Added armor. - -commit 7076c78782a22b7a04d4234f4fa426ca0c30e8ca -Author: Arthur Uzulin -Date: Tue Oct 8 21:08:46 2013 +1100 - - Merge branch 'armor' of https://github.com/mDiyo/TinkersConstruct - -commit 6a7b576deb79d958f3a29c2e2248bcbf827655fe -Merge: f5b939d 8a4c85a -Author: mDiyo -Date: Mon Oct 7 20:50:40 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit f5b939d8ced14c46e4ce7dadad55009c945a4045 -Author: mDiyo -Date: Mon Oct 7 20:49:55 2013 -0700 - - Smeltery Gigantus activate! - -commit 8a4c85a51b63943a1149ace07ae7d0352f0bf958 -Author: Sunstrike -Date: Mon Oct 7 19:58:36 2013 +0100 - - Revert "Change derpy faucet behaviour." - - Reverting due to issues that I currently do not have time to fix. - -commit 10101a6561794953aca443aedf79cd5efe669074 -Author: Progwml6 -Date: Mon Oct 7 00:36:03 2013 -0400 - - add Italian translation to list of languages loaded - -commit f59ddceebc671183226d00fa12dbbbcf844bf044 -Merge: 8ce8565 c50a1b3 -Author: mDiyo -Date: Sun Oct 6 20:54:55 2013 -0700 - - Merge pull request #229 from progwml6/master - - update thaumium support by upating the location of the necessary config ... - -commit c50a1b3d29c27c30bc7e09334a634809e88e3ad0 -Author: Progwml6 -Date: Sun Oct 6 23:53:35 2013 -0400 - - update thaumium support by upating the location of the necessary config in Thaumcraft 4 - -commit 8ce8565490e913d4f83fd7dc664f567ca3b584b6 -Author: mDiyo -Date: Sun Oct 6 16:18:19 2013 -0700 - - Fix gui on Smeltery - -commit 21f298f06432da41df57f88934de9e5472064944 -Author: mDiyo -Date: Sun Oct 6 11:01:09 2013 -0700 - - Proper default on slime island rarity - -commit 146cc6c65b2c03c27f9dfd56d9fc1d114e1d93d4 -Author: mDiyo -Date: Sun Oct 6 10:54:46 2013 -0700 - - Fix Tool Station Gui - -commit 2ffa646f85c03d3fcb64f8f6285793840509f9ad -Author: mDiyo -Date: Sun Oct 6 10:14:33 2013 -0700 - - Choose the right folder for IC2 items - -commit f92af7cc68920d084cbded4934568ef3294b04f9 -Author: mDiyo -Date: Sun Oct 6 09:53:48 2013 -0700 - - Change to internal reflection for accessing IC2 itemstacks - -commit 26fb95de90bb37f50f01657b9cc509f993ea81bb -Merge: 780dfe1 135ffc2 -Author: mDiyo -Date: Sun Oct 6 09:46:46 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 135ffc2b4edf3d69c297a212c1c33c4cca163fe5 -Author: Sunstrike -Date: Sun Oct 6 17:46:23 2013 +0100 - - Remove Preloader experimental blacklist. - -commit 780dfe1e73a8d53549ca5f1bcd77e4cfab925198 -Author: mDiyo -Date: Sun Oct 6 09:46:22 2013 -0700 - - Dont break the Smeltery yet, really! - -commit 4f34799c2b6d568d21ba8bb1b0633819f6858895 -Merge: 6f3daa1 635632b -Author: mDiyo -Date: Sun Oct 6 09:26:20 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 6f3daa1a281c47becae23b344aec841d1d444979 -Author: mDiyo -Date: Sun Oct 6 09:25:41 2013 -0700 - - Update version number to stable - -commit 4cd2d07d4c5475a2c551f585ce231830e26a4d34 -Author: mDiyo -Date: Sun Oct 6 09:24:58 2013 -0700 - - Remove MFR support - -commit 635632bc65490aa03bcccc981d2de303e7e45a92 -Author: Sunstrike -Date: Sun Oct 6 16:50:22 2013 +0100 - - Pretty sure it'll work this time. Closes #222. - -commit f728a2b7b1b37cecce05a85c5a8124e66981e838 -Author: Sunstrike -Date: Sun Oct 6 16:42:14 2013 +0100 - - REALLY blacklist MFR. Derp. Closes #222 FOR REALS this time. - -commit a6d01d80fab49f7ce0c1b13bd04bce1612322d7d -Author: Sunstrike -Date: Sun Oct 6 16:00:49 2013 +0100 - - Blacklist MFR plugin from Preloader. Closes #222. - -commit 821666ec4510770525e7e521a894d0cafd77f1c6 -Author: Sunstrike -Date: Sun Oct 6 15:46:23 2013 +0100 - - Preloader: Configurable logging. - Added to assist in debugging rogue ClassDefNotFoundExceptions. Config file is at config/TConPreloader.cfg and is a standard Java properties file. - -commit 51cc7f8ed05ae4b2743ee0f9af6bc72b8b74ddc3 -Author: Arthur Uzulin -Date: Mon Oct 7 00:38:28 2013 +1100 - - Some more work on "Eye of the Moon" - -commit 28f912a4e74ab4b35808cf128c65f3062ddd86b0 -Author: mDiyo -Date: Sat Oct 5 22:56:51 2013 -0700 - - Dont break stuff before they need broken - -commit d99350d85533a3040d595e617182a4329edfff00 -Author: mDiyo -Date: Sat Oct 5 22:49:39 2013 -0700 - - Smeltery Gigantus Networkus Transmissus - -commit 0dbf24531888bb341f3be68f642deabe9266451e -Author: Sunstrike -Date: Sun Oct 6 02:20:39 2013 +0100 - - Change derpy faucet behaviour. - It now won't stop when prodded twice; it will continue until done or source drained. - -commit b8b366d6d9943c89603fe3b749e68739849f3308 -Merge: 04d9dbf 1b65f9a -Author: Sunstrike -Date: Sun Oct 6 02:08:25 2013 +0100 - - Merge branch 'spatial-io' - -commit 1b65f9a8d47040d8c2d2f8496622da8cdd45c27c -Author: Sunstrike -Date: Sun Oct 6 02:07:22 2013 +0100 - - Finish AppEng compat module. - -commit 04d9dbf33b9dc7c83116b2fbb7b265a60f8dd37d -Merge: 519f9cc 01834bc -Author: mDiyo -Date: Sat Oct 5 16:58:45 2013 -0700 - - Merge pull request #223 from TheVikingWarrior/patch-1 - - Create it_IT.xml - -commit 01834bc82abeeeca12b72843cb7a9f7bdbe79a4f -Author: TheVikingWarrior -Date: Sat Oct 5 23:36:17 2013 +0200 - - Create it_IT.xml - - Hello, this is the Italian translation, hope it help - -commit 519f9cc2c7878bdd4c87f873f417619a23cd44c3 -Merge: c4e1f21 252ebed -Author: mDiyo -Date: Sat Oct 5 11:52:30 2013 -0700 - - Merge pull request #221 from Vexatos/patch-1 - - Update de_DE.xml - -commit 252ebed50d04847a99848f85280b434f5e9b2aac -Author: Vexatos -Date: Sat Oct 5 20:51:32 2013 +0200 - - Update de_DE.xml - -commit c4e1f21ac198bbec00c59be7f36d3cbe9ee2ebe3 -Author: mDiyo -Date: Sat Oct 5 11:21:32 2013 -0700 - - Standarize fluid names - -commit 78de11e08698cde56d0e73b7f280083bb3ee3aa1 -Author: Sunstrike -Date: Sat Oct 5 18:25:27 2013 +0100 - - Start work on supporting Spatial IO - -commit 3c4b0defce754ad105f1955d9104a804e46d4e7f -Author: Sunstrike -Date: Sat Oct 5 17:26:23 2013 +0100 - - Finalise Waila integration. - Fixed fluid names in tanks and channels, add support for Smeltery Controller. - -commit f1288ad39b77d7a0128d97f4d4db0bd497360b45 -Author: Sunstrike -Date: Sat Oct 5 17:03:38 2013 +0100 - - Initial Waila plugin. - Supports seared tank derivatives and Casting channels. Essence extractor stuff present but disabled due to bug #219. - -commit 96630e660759e3286839e7ae7f3702f1f24fa713 -Merge: 8a10734 dc03191 -Author: mDiyo -Date: Fri Oct 4 16:26:22 2013 -0700 - - Merge pull request #216 from samrg472/master - - Restore compatibility with MFR - -commit dc0319101e0973c21092a6f6a72214b7ee20309b -Author: samrg472 -Date: Fri Oct 4 17:53:11 2013 -0400 - - Restore compatibility with MFR - -commit 8a10734932e81099ee2218838af79bcc57d2e0de -Author: Sunstrike -Date: Fri Oct 4 00:16:04 2013 +0100 - - Tinkers Corestruct v0.0.1 - Added initial release of preloader (thanks AlgorithmX2). Cleaned mcmod.info. Updated build.xml appropriately. - -commit 61acdc7d3e77d9d3375078acd311fd1968a61b2e -Author: Progwml6 -Date: Wed Oct 2 00:39:00 2013 -0400 - - add most of AE api, uncomment code for AE charging - -commit be979ef0648e91e1f61179becb7cd11890e24e4f -Author: mDiyo -Date: Tue Oct 1 20:02:59 2013 -0700 - - Remove stray imports - -commit ea67ab95539e12da94516c43bd523df55536d45b -Author: mDiyo -Date: Tue Oct 1 19:55:53 2013 -0700 - - Remove appeng API - -commit b5e545f831cfe9878d5fbc31ffd4363c1cb0540b -Merge: f954784 c0b0d48 -Author: mDiyo -Date: Tue Oct 1 19:45:45 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit f954784e6e07216dc6c048122cb8ebfd450af5f7 -Author: mDiyo -Date: Tue Oct 1 19:45:27 2013 -0700 - - Comment out AppliedEnergistics support temporarily - -commit 349b124ac3a9a413d053002d7afcc5f5c8afa4d1 -Author: mDiyo -Date: Tue Oct 1 19:44:04 2013 -0700 - - Smeltery broken into components - -commit c0b0d489d5c7ba23dabf62564092f56e63787589 -Merge: 8b086fa ee71c10 -Author: fuj1n -Date: Mon Sep 30 23:58:15 2013 -0700 - - Merge pull request #213 from progwml6/master - - neaten up code, document the purpose of the 2 registration methods - -commit ee71c10e7d24f2f39b88fa703c1d22a7394e1efd -Author: progwml6 -Date: Tue Oct 1 02:39:39 2013 -0400 - - get rid of excess unused code - -commit 2b48c2fe88c3c16675e04faa358d2e1532fc7c9a -Author: progwml6 -Date: Tue Oct 1 02:37:32 2013 -0400 - - neaten up code, document the purpose of the 2 registration methods - -commit 8b086fa9f82abf33ec12e86d295d8ec0881b0b59 -Merge: 9542c56 5a75f66 -Author: fuj1n -Date: Mon Sep 30 23:08:35 2013 -0700 - - Merge pull request #211 from progwml6/master - - add in FMP plugin to tconstruct - -commit 5a75f66e3f71f53213c7ae9d12880033365d614a -Author: progwml6 -Date: Tue Oct 1 01:59:38 2013 -0400 - - adding seared stuff decided against during discussion with fuj1n, changing metadata method to have start, end indicies to avoid possibilities of dupes in nei - -commit ab3b5dd78927a2926eac9375e65b70d3e953fe10 -Author: progwml6 -Date: Tue Oct 1 00:47:02 2013 -0400 - - add mattock to language file - -commit 9542c568a0292f498694bb32dfb1a5d5f393fd66 -Merge: 9a6ace2 19d2ebe -Author: mDiyo -Date: Mon Sep 30 21:31:10 2013 -0700 - - Merge pull request #212 from nevercast/master - - Fix DryingRack - -commit 19d2ebee819e31cd46c702fd47ba1f322c37fbbe -Author: Josh Lloyd -Date: Tue Oct 1 17:26:18 2013 +1300 - - Fix DryingRack - -commit 2bc58d41b206eb67aa6bf1e930d9e599ff407700 -Author: progwml6 -Date: Mon Sep 30 23:54:04 2013 -0400 - - clean up formatting, tweak build.xml more - -commit d791b11c7bc69f5e0d37cf3d4bb8aa5a318a31ab -Merge: 5a50706 9a6ace2 -Author: progwml6 -Date: Mon Sep 30 23:13:15 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 5a507067689d610234d12790ebfa6f11e2191154 -Merge: df6eaf4 bb81a9a -Author: progwml6 -Date: Mon Sep 30 23:07:22 2013 -0400 - - Merge branch 'master' of github.com:progwml6/TinkersConstruct - -commit df6eaf4dfc47e7db89b3c2fde403da7b87532412 -Author: progwml6 -Date: Mon Sep 30 23:07:14 2013 -0400 - - added in FMP plugin , tested code with and without fmp installed - -commit 9a6ace2f696cf574973a30360793851a406972f0 -Merge: 702abbb 2407548 -Author: mDiyo -Date: Sun Sep 29 19:38:43 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 702abbb011c18249e56955528bf5cc85a1804f0d -Author: mDiyo -Date: Sun Sep 29 19:38:20 2013 -0700 - - Smeltery Components - -commit 24075483d1e0f3994c7aad8ce955d5aa7995e30a -Author: Sunstrike -Date: Sun Sep 29 21:28:47 2013 +0100 - - 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: - -commit 9c0b234d26bc66eff1f70b5389fb3d9e4b962863 -Merge: 4747afa ca02a13 -Author: Sunstrike -Date: Sun Sep 29 11:19:55 2013 -0700 - - Merge pull request #204 from logomaster256/master - - Misc things - -commit ca02a13337999bed7865b15fde9866f27cf65b4c -Author: logomaster256 -Date: Sun Sep 29 14:20:36 2013 +0200 - - Added clear glass to the ore dict - -commit 4747afabe76682d2ebff2a1e58cd21deea39bcba -Author: mDiyo -Date: Sun Sep 29 09:38:04 2013 -0700 - - Update IC2 API, only include needed parts - -commit def42288133524df90334f2d776600f8183e736c -Merge: bdd2701 347bc37 -Author: mDiyo -Date: Sun Sep 29 09:05:47 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit bdd2701368054ae9e4e9029f64b046b454992a0f -Author: mDiyo -Date: Sun Sep 29 09:05:08 2013 -0700 - - Fix version check for structures, begin AdaptiveSmelteryLogic - -commit 347bc37c4827b19e300ca33e376fcc4c2296afa7 -Author: Arthur Uzulin -Date: Sun Sep 29 23:56:06 2013 +1000 - - Clear glass + Meta 15 = no-connect - -commit 364c564569301b8974df5849aa856684e61a1079 -Author: logomaster256 -Date: Sat Sep 28 00:17:29 2013 +0200 - - 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 - -commit e79846cbd3efb386ac9e3188be11c74f0c6e3df1 -Author: fuj1n -Date: Sun Sep 29 19:31:18 2013 +1000 - - Fixed cape-related stacktrace in the console - -commit 5f6fe5f0c5df60de63ba404f2be1ee11e95b1745 -Author: fuj1n -Date: Sun Sep 29 16:22:22 2013 +1000 - - Finalised capes.txt - - From this point forward, only allow the removal of capes, no other changes or additions. (Tinker's Devs excepted) - -commit e2f785f25fa738d7ee40b306cf47328856c3d15e -Merge: b15d538 bb81a9a -Author: Zach -Date: Sat Sep 28 23:16:28 2013 -0700 - - Merge pull request #207 from progwml6/master - - make sure the ic2 api is not packaged in order to prevent crashes - -commit bb81a9af7a119aa76735d93321356c061773b781 -Author: Progwml6 -Date: Sun Sep 29 02:14:10 2013 -0400 - - make sure the ic2 api is not packaged in order to prevent crashes - -commit b15d53886e7542846a45b4088bb854ce4d2f5f08 -Merge: c794025 0357ec6 -Author: mDiyo -Date: Sat Sep 28 21:10:39 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit c79402563c7effd6abdee4adde4c392bb19d681c -Author: mDiyo -Date: Sat Sep 28 21:10:13 2013 -0700 - - Finish world scanning on AdaptiveInventoryLogic - -commit 0357ec615ad0c78f35ea2e87d2223c4b7c0ccaa1 -Merge: 0630c3b 9c702ae -Author: mDiyo -Date: Sat Sep 28 17:50:03 2013 -0700 - - Merge pull request #206 from andrejsavikin/patch-1 - - Update capes.txt - -commit 0630c3b661eb2ea00f6afd8f3fc1fb29aa2fc9c3 -Merge: 903a323 b2cff48 -Author: mDiyo -Date: Sat Sep 28 17:49:29 2013 -0700 - - Merge pull request #203 from maexono/master - - Make arrows fire from dispensers as projectiles - -commit 9c702ae49cf444610b1d7ef33af2dbcf5bb86933 -Author: andrejsavikin -Date: Sun Sep 29 00:19:55 2013 +0200 - - Update capes.txt - - Changing my boring blue cape to fuj1n's awesome cape(stealing fuj1n's cape) - -commit 903a3238c38457f732cb5ea79b5579857a0ed76d -Author: mDiyo -Date: Sat Sep 28 08:57:43 2013 -0700 - - Lower required Forge version - -commit 5de6661859d1e49d50c6fa2b931c7eda9e4b404b -Merge: 363f1a8 b01b2e7 -Author: mDiyo -Date: Sat Sep 28 08:45:57 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 363f1a81982c4a50055de8ec881942db1e2820e5 -Author: mDiyo -Date: Sat Sep 28 08:45:28 2013 -0700 - - Add recipes for re-staining clear glass, attempt at backwards compatibility for village structures - -commit b01b2e7d6c878b382d0fab665e847feb77575457 -Author: Sunstrike -Date: Sat Sep 28 04:15:28 2013 +0100 - - Update capes.txt - -commit ea484dce6d336fbde8265073e2cd9a8c01385f8f -Author: mDiyo -Date: Fri Sep 27 18:57:09 2013 -0700 - - Update capes.txt - -commit b2cff48afd2ed6fab5185c229119298997be85e2 -Author: Max Teegen -Date: Fri Sep 27 18:31:50 2013 +0200 - - Proper code formatting. - -commit 5ef60caf032c606cc3eb50a7bb482b7ea6ed17aa -Merge: d83785a f5faf43 -Author: Max Teegen -Date: Fri Sep 27 18:30:49 2013 +0200 - - Merge branch 'master' of https://github.com/maexono/TinkersConstruct - -commit d83785ada6757243a884669e27d5e7fd4294297b -Author: Max Teegen -Date: Fri Sep 27 18:25:58 2013 +0200 - - Implemented dispenser behavior for firing arrows. - -commit f5faf4321ec8bf3eb13fbbbeba01628f82354379 -Author: Max Teegen -Date: Fri Sep 27 18:25:58 2013 +0200 - - Implemented dispenser behavior for firing arrows. - -commit abdd27c23592073bf77b740f738406748e58dae1 -Author: Arthur Uzulin -Date: Thu Sep 26 15:23:06 2013 +1000 - - "Tsuki no me" almost complete - - Becomes super apparent what project "Tsuki no me" is about - -commit 21a611ea027ab5710f84d45a8feba9b103be0f50 -Author: Arthur Uzulin -Date: Tue Sep 24 21:16:00 2013 +1000 - - More stuff on "Tsuki no me" - -commit e94cf46b9506ebf285f72b09fa15f6358e384600 -Author: Arthur Uzulin -Date: Tue Sep 24 16:43:44 2013 +1000 - - For the sake of legacy compatibility - -commit 4dc86578416a1bec1e060803541f7c380547576e -Merge: 15cda37 02a08e0 -Author: mDiyo -Date: Mon Sep 23 23:28:45 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 15cda37162ba70ac77acec26862aac2215c8508f -Author: mDiyo -Date: Mon Sep 23 23:28:15 2013 -0700 - - Remove sidedness on Smeltery Drains - -commit 02a08e06bd64d92f045161fa5ffc695c56dc7cdc -Author: Arthur Uzulin -Date: Tue Sep 24 14:07:15 2013 +1000 - - Disabled AdvancedDrawbridgeLogic code to... - - ...prevent build failures - -commit 7b7bea76c353ca0feb49550f69e7b8aef49b42ee -Author: Arthur Uzulin -Date: Tue Sep 24 13:39:21 2013 +1000 - - Started works on advanced drawbridge - - (Currently not ready to become a block yet, or else may be crashy) - -commit e0926abb5624f79cb4a5430d6573c6888b86e1ca -Author: Arthur Uzulin -Date: Tue Sep 24 13:16:07 2013 +1000 - - Improved drawbridge logic - -commit d509d486752d5bd97b583b6b66fc4a30b2bde67f -Author: mDiyo -Date: Mon Sep 23 06:43:10 2013 -0700 - - Fix crash when drawbridge is placed in drawbridge camo slot - -commit 7ba7c1fcf18dbf3546cc9b2addd9a9f24ee7ed16 -Merge: fc2cd3b 3c85f3b -Author: mDiyo -Date: Mon Sep 23 06:15:08 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit fc2cd3bdbd9d2a5bc370746bb54bcba3a23ca5c4 -Author: mDiyo -Date: Mon Sep 23 06:14:27 2013 -0700 - - Prevent checking in TContent - -commit 8ac30c541ec226b7110d846ff5431e5e574f1a57 -Author: mDiyo -Date: Mon Sep 23 06:12:02 2013 -0700 - - Initial multi-block detection in AdaptiveInventoryLogic - -commit 3c85f3bba08773d3028bd53a7d8a8b594b0bc3eb -Author: Progwml6 -Date: Sat Sep 21 16:04:26 2013 -0400 - - remove un needed AT entry - -commit f8de092f6a57824bed191d5b97b82c7247e90e48 -Merge: ffd46ea 9d04866 -Author: Progwml6 -Date: Sat Sep 21 16:03:19 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 9d048662af0927665d9aa259ac2e215baaf0320e -Merge: 10f04a6 6584a6c -Author: Sunstrike -Date: Sat Sep 21 08:57:00 2013 -0700 - - Merge pull request #199 from Zerokyuuni/master - - Tasty Nugget - -commit 6584a6c0365c64f9fe0aabaee9040d5736a736bf -Author: Zerokyuuni -Date: Sat Sep 21 11:51:21 2013 -0400 - - Tasty Nugget - - Pigiron nuggets are tasty - -commit ffd46ea0eaa31d9c2c8213ed09c3e849ddd69f5d -Merge: 1c8f56a 10f04a6 -Author: Progwml6 -Date: Sat Sep 21 10:12:52 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 10f04a6534cde5808a6683276809f7dc34965c8d -Author: mDiyo -Date: Sat Sep 21 06:14:11 2013 -0700 - - Update Smeltery Blood to new fluid system - -commit 7595cbfc0e3a5b4bf1e303c845d01328238c6fdd -Author: mDiyo -Date: Sat Sep 21 05:10:55 2013 -0700 - - Items always omnomnom - -commit a27c2a552a3505b28071e601d7be6eb034b28101 -Author: mDiyo -Date: Sat Sep 21 04:36:35 2013 -0700 - - Comments! - -commit d6162a14a5cf4fd3b145e14626e93cc95adce756 -Author: mDiyo -Date: Sat Sep 21 04:34:08 2013 -0700 - - Really make smeltery only attack entities if it contains fluid - -commit 2feefaa6f5413ee8883cccabfcb18038c3f5f79b -Merge: e07bd53 86c19cf -Author: mDiyo -Date: Sat Sep 21 04:33:18 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit e07bd5312f0349ba807762d967f658babf2c2efd -Author: mDiyo -Date: Sat Sep 21 04:32:46 2013 -0700 - - Fix Smeltery eating invalid items, only attack mobs if fluid is inside Smeltery - -commit 86c19cf596e48d5748f29d63aa3be2410543ee7f -Author: Arthur Uzulin -Date: Sat Sep 21 21:01:57 2013 +1000 - - Slight changes to glass pane top/bottom textures - -commit 2c946308ca6587dd41a6dc20b77a873f7d855c36 -Author: Arthur Uzulin -Date: Sat Sep 21 19:55:57 2013 +1000 - - Update Sounds for 1.6.4 - - The old method would still have worked - -commit e57da5ad4e8f48ff3ea349ca7d25cc2ea88277e9 -Author: mDiyo -Date: Sat Sep 21 00:50:54 2013 -0700 - - Fix empty smeltery trying to drain - -commit 1c8f56a3dd9fc10a962f1845fa64ded4219c33c0 -Merge: 6570824 19a12b1 -Author: Progwml6 -Date: Fri Sep 20 19:11:50 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 19a12b12aeadb42160c5db69098b25a5aeb5a977 -Merge: a662601 2aaeb13 -Author: Zach -Date: Fri Sep 20 16:10:26 2013 -0700 - - Merge pull request #198 from alexbegt/master - - Updating to 1.6.4 - -commit 2aaeb1340aff0334d3e8187305c38812da34b3ae -Author: Alexander Behrhof -Date: Fri Sep 20 19:09:08 2013 -0400 - - OK i think i fixed it. - -commit 6b3b6195465629ef49b9bcb1a7793eac2378c570 -Author: Alexander Behrhof -Date: Fri Sep 20 19:07:16 2013 -0400 - - Making @progwml6 happy. - -commit 3ab35f3655414245aa5aab9000e43721a7a645f1 -Author: Alexander Behrhof -Date: Fri Sep 20 18:55:24 2013 -0400 - - Fixing the "Failed to load texture" - - Failed to load texture: minecraft:assets/textures/font/ascii.png - -commit 9f35cc0b8d955a1ed2c7b5c4360c120dff92bd7d -Author: Alexander Behrhof -Date: Fri Sep 20 18:46:00 2013 -0400 - - Update to 1.6.4 - -commit a662601396cc9e729f4638549836d6b17b9ed4f1 -Author: Sunstrike -Date: Fri Sep 20 20:52:07 2013 +0100 - - Move API outputs to bin/api/ - -commit 6570824109f495944c5a6c404c0c9eb6b9ce1b09 -Merge: d6ba067 8c14307 -Author: Progwml6 -Date: Fri Sep 20 15:11:25 2013 -0400 - - fix merge conflicts - -commit 8c1430783557e9256865828677a8cda62c37b4f2 -Author: Sunstrike -Date: Fri Sep 20 20:02:36 2013 +0100 - - Add pack-api target to Ant - -commit d6ba067b9345df6a3ee5d0cf6fee3b2a75522d02 -Author: Progwml6 -Date: Fri Sep 20 14:35:23 2013 -0400 - - added API to ant targets - -commit 88c6e48bc0276eb2f9e646b31d62c0cb3b547238 -Author: Progwml6 -Date: Fri Sep 20 00:16:57 2013 -0400 - - fixing rendering of molten metals through semi transparent blocks by moving it to render pass 0 - -commit eea1a52075cb450882c4ab20a879aab69175b654 -Merge: fd4e335 542bf5c -Author: progwml6 -Date: Thu Sep 19 17:19:19 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit fd4e3351068a7a66a1a1fc355364049e44835360 -Author: Progwml6 -Date: Thu Sep 19 17:17:24 2013 -0400 - - add in language to lang list that exists in assets be careful!!! - -commit 542bf5c6436a5dddc2182715234d60871f235eda -Merge: 86bc496 cc728d2 -Author: Zach -Date: Thu Sep 19 13:46:17 2013 -0700 - - Merge pull request #192 from purpleposeidon/patch-1 - - Update HarvestTool.java - -commit 86bc4965c1698f878f6c149788c3229475828127 -Merge: cb84235 9d4cc1c -Author: Zach -Date: Thu Sep 19 13:43:29 2013 -0700 - - Merge pull request #194 from GraxRabble/master - - patched divide by zero within SmelteryGui - -commit cb842358af5278a520c877170ba3d3bab98115f7 -Author: mDiyo -Date: Thu Sep 19 04:37:20 2013 -0700 - - Reduce updates on Casting Channels, Smeltery should interact better with dumb pipes - -commit 89c0f2e2b6638b93b1204d138f0cf9f0c77c8f3c -Author: mDiyo -Date: Thu Sep 19 03:48:43 2013 -0700 - - Expose all fluids to FluidTankInfo[] - -commit cbecc93223a47c1ef793806f8580a09ce7fa7aa2 -Author: mDiyo -Date: Wed Sep 18 23:16:00 2013 -0700 - - Drawbridges pick up slime channels - -commit eb02cf4e532c7938261ba5bdad1748d85e00b4f5 -Author: mDiyo -Date: Wed Sep 18 22:40:21 2013 -0700 - - Update Forge build version - -commit 6d495ce28605bff44a0b412465b9de486811fda2 -Author: mDiyo -Date: Wed Sep 18 22:26:58 2013 -0700 - - Update structures better - -commit 9198259fa1c8f8728e7d0ad926612ab06616618c -Author: mDiyo -Date: Wed Sep 18 22:05:35 2013 -0700 - - Update to 1.6.3 - -commit 4dc3a1a9845cb0d56a7fc4c1cf6b5cdf66382aa9 -Author: mDiyo -Date: Wed Sep 18 20:38:13 2013 -0700 - - Revert required Forge version - -commit 9ed8e6e9cd6d83a4ee285c8290db9dcffae1c161 -Author: mDiyo -Date: Wed Sep 18 20:30:24 2013 -0700 - - remove stray import - -commit f7b8f04b2ef6b712766f0dce0ec187ff0b783982 -Author: mDiyo -Date: Wed Sep 18 20:26:15 2013 -0700 - - Move necrotic flag to AbilityHelper.java - -commit ca0f5d562071721a159ea99a31ffb4b28c830b55 -Author: mDiyo -Date: Wed Sep 18 19:51:14 2013 -0700 - - Update build.xml to use srgnames for reobfuscation - -commit b4ae035547f9704c9286d9fe54bd5b8d1ded722d -Merge: fcaf3e7 a379bf9 -Author: mDiyo -Date: Wed Sep 18 19:46:26 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit fcaf3e7d7cb252825d9178ca037335580a104a95 -Author: mDiyo -Date: Wed Sep 18 19:46:04 2013 -0700 - - Remove stray imports - -commit a379bf90e303edfb211a8efde7d09ee0341f4d63 -Merge: 6fec7f3 0823a61 -Author: Zach -Date: Wed Sep 18 19:38:05 2013 -0700 - - Merge pull request #196 from progwml6/master - - update to 1.6.3 w/ new forge/mcp - -commit 0823a619cb90b359f2142b1e9e0c94bd85e52bbc -Author: Progwml6 -Date: Wed Sep 18 22:36:30 2013 -0400 - - update to 1.6.3 w/ new forge/mcp - -commit 6fec7f36b036fa827bdc71a478c2abf6c29c2f9b -Author: mDiyo -Date: Wed Sep 18 18:55:25 2013 -0700 - - Move BowBase out of library - -commit db9046a4b9ce00e83edd89dc9751db4da6f6005e -Merge: 1b9475d ff7b967 -Author: mDiyo -Date: Wed Sep 18 15:12:41 2013 -0700 - - Fix merge conflicts - -commit 1b9475d8d054fe517b4168b8603e28ba24b9864c -Author: mDiyo -Date: Wed Sep 18 15:10:37 2013 -0700 - - Gardeslime Disappear! - -commit 9d4cc1c037448a016ab040b7e3cbda1e889bcf2e -Author: GraxRabble -Date: Wed Sep 18 07:42:39 2013 -0400 - - patched divide by zero within SmelteryGui - -commit ff7b96728d17721d7dc574532c630ecaf075ebca -Merge: be73c39 2f989ca -Author: mDiyo -Date: Wed Sep 18 00:48:06 2013 -0700 - - Merge pull request #190 from Pokefenn/patch-3 - - Added some peoples names onto the list. Updated! - -commit cc728d2852c30fbb0ceea452a00a399360cd151d -Author: James -Date: Tue Sep 17 22:49:20 2013 -0700 - - Mine blocks with weird materials if Forge says it's alright - -commit dfacbe5a9897683a32d90139275dd45fcc167c4c -Author: James -Date: Tue Sep 17 22:39:49 2013 -0700 - - Update HarvestTool.java - - Some light testing suggests it isn't 100% broken. - -commit be73c39bda6b683d1097426c1a189d9601320169 -Author: Arthur Uzulin -Date: Tue Sep 17 20:45:50 2013 +1000 - - Small tweaks to clear panes - -commit a94591818c42851200cc536913ab0b344b58965d -Author: Arthur Uzulin -Date: Tue Sep 17 20:25:24 2013 +1000 - - ShouldSideBeRendered fix - -commit 0cbf8b270860413aaded2fd4287548f3096037b7 -Author: Arthur Uzulin -Date: Tue Sep 17 20:00:54 2013 +1000 - - Work done on new pane renderer(WIP) - -commit 2f989caa60d2c683a22f579baadb2003a5d48363 -Author: Pokefenn -Date: Tue Sep 17 09:56:56 2013 +0100 - - Added some peoples names onto the list. Updated! - - Updated with a few more names. - -commit 238a558fc685c83162202a20254038250f4836bf -Merge: 5fddacd b92b15b -Author: mDiyo -Date: Mon Sep 16 23:43:34 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 5fddacd0fc908df344557c9e024f43c63ed79c7a -Author: mDiyo -Date: Mon Sep 16 23:43:17 2013 -0700 - - Add oredict support for wood slabs and sticks - -commit b92b15bb9628e55b1dae01e007d036a5534618c6 -Merge: e3b92c8 8d0172e -Author: Zach -Date: Sun Sep 15 20:24:33 2013 -0700 - - Merge pull request #187 from progwml6/master - - add option to not generate slime islands in dim 0 - -commit 8d0172ea8f44667a35c0de26b2330460718c642e -Merge: f5882ee bfd999f -Author: progwml6 -Date: Sun Sep 15 22:47:32 2013 -0400 - - fix stupid merge nonsense - -commit f5882eef9edd55ddbd7e292c439477feb929d67b -Merge: ccf49b1 e3b92c8 -Author: progwml6 -Date: Sun Sep 15 22:41:24 2013 -0400 - - fix merge conflicts - -commit bfd999f05ad653868ff83f62cb2d1456c047cfd7 -Merge: ccf49b1 e3b92c8 -Author: progwml6 -Date: Sun Sep 15 22:41:24 2013 -0400 - - fix merge conflicts - -commit ccf49b1e20c77c35c2b01a67f6c5a5b1bb296349 -Author: progwml6 -Date: Sun Sep 15 22:33:57 2013 -0400 - - add option to not generate slime islands in dim 0 - -commit e3b92c88575c45d0b03c70a15a22327a4517537b -Author: mDiyo -Date: Sun Sep 15 19:09:57 2013 -0700 - - Fix fluid icon registration, update version number to stable - -commit 350f59ae5adbca385276f0c7861e0be37131a2af -Author: Sunstrike -Date: Sun Sep 15 17:01:56 2013 +0100 - - Rebuild item throwing into smeltery feature (with config opt) - -commit 228349491f30ee94eec95811d2075e47ec74fa03 -Merge: 9748b39 412c5a3 -Author: Zach -Date: Fri Sep 13 03:36:01 2013 -0700 - - Merge pull request #182 from progwml6/master - - removing unused EBXL API - -commit 412c5a37a67473635376cded9a93d1e0ac80f0ca -Author: Progwml6 -Date: Fri Sep 13 06:35:31 2013 -0400 - - removing unused EBXL API - -commit 9748b39441d66b68b57d36db9fd60715517cf3b3 -Merge: 8b7c806 d26e0bf -Author: Zach -Date: Fri Sep 13 03:10:47 2013 -0700 - - Merge pull request #180 from Zerokyuuni/master - - Mo' Tinker and Blade Craft - -commit 8b7c806ae20b7590021b9e2ce6d819ad31774e11 -Merge: 5b3c6d1 afe2d86 -Author: Zach -Date: Fri Sep 13 03:00:18 2013 -0700 - - Merge pull request #181 from progwml6/master - - initial mystcraft support(blacklisting alloys, netherores as fluid pages) bop support for slime islands, tweaks of blacklist - -commit afe2d8657a8749de50b6a9164bd9f07da0a58dec -Author: Progwml6 -Date: Fri Sep 13 05:23:43 2013 -0400 - - fixed some bugs to prep for PR - -commit d26e0bf6f21d7d686973d7c9148e209fc652e49b -Author: Zerokyuuni -Date: Fri Sep 13 00:09:00 2013 -0400 - - Mo' Tinker and Blade Craft - - Fixed Fryingpans causing slot hifting when in the off-hand, added a - config to allow hatchets to be used in the off-hand, and made Paladin - Steve happy by letting him use a shield alongside a Hammer - -commit 8e41fb6f43564a477b4215f9b663a5485ab76bdf -Merge: f6018b6 5b3c6d1 -Author: Progwml6 -Date: Thu Sep 12 18:19:44 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit f6018b668df86afd738bea503658c0030753c072 -Author: Progwml6 -Date: Thu Sep 12 18:19:21 2013 -0400 - - adding in BOP Promised land support for slime islands -- generates island only no pool. code style cleanup - -commit 5b3c6d19870f29638b8d6aef12cc1d247d5291a6 -Author: Sunstrike -Date: Thu Sep 12 15:25:04 2013 +0100 - - Fix Mine and Blade API (Remove Heraldry components) - -commit 1ee95bbdeffdd013442ed136e599db043f6c875f -Merge: 1b05f4e 65b851c -Author: Sunstrike -Date: Thu Sep 12 14:39:22 2013 +0100 - - Merge PR #178: Tinker and Blade - Warconstruct (Zerokyuuni/master) - - Signed-off-by: Sunstrike - -commit 65b851c460af935d3a203ea900752032991bbf17 -Author: Zerokyuuni -Date: Tue Sep 10 10:21:00 2013 -0400 - - Tinker and Blade 2: Warconstruct - -commit 631935c921b25ac49a70a3187cb170478e008f1c -Author: mDiyo -Date: Wed Sep 11 13:02:54 2013 -0700 - - Remove Skill textures - -commit cc43c2a493a48563d5dacd52ffe9e13019e41e82 -Author: mDiyo -Date: Wed Sep 11 12:14:42 2013 -0700 - - Remove extra book recipe - -commit 70bf94571dcb803142389234f5f2b10044dca195 -Author: Sunstrike -Date: Wed Sep 11 19:47:18 2013 +0100 - - Don't mind me, being mildly OCD about formatting... - -commit 8c2a1c483ca415a091726bcad5c7a79c6fb83fc6 -Author: GraxRabble -Date: Wed Sep 11 04:21:27 2013 -0400 - - removed the hack and left only the vanilla leaf fix - -commit bbeed32c56a4779d9cb81d6951d6174e2db76c6d -Author: GraxRabble -Date: Tue Sep 10 22:52:28 2013 -0400 - - Fixed leaf fletching dup - -commit 3e87a889ae044d0aa914a95f6b1ed7668a4c4eb3 -Author: Sunstrike -Date: Tue Sep 10 00:00:49 2013 +0100 - - Change _Sunstrike cape to point at different file. - -commit 772846260e06fedc86ae924adfd2dabe15ba2318 -Merge: 8f4856c 1b05f4e -Author: Progwml6 -Date: Thu Sep 12 04:08:30 2013 -0400 - - Merge branch 'master' of github.com:mDiyo/TinkersConstruct - -commit 8f4856c9af0e6218275161607ecf0b34b443060d -Author: Progwml6 -Date: Thu Sep 12 03:44:15 2013 -0400 - - addition of blacklisting alloy and nether molten fluids in mystcraft ages via IMC NBT formatted messages - -commit 1b05f4e8835c9ab6f9779ac289c584ef3d57f2e9 -Author: mDiyo -Date: Wed Sep 11 13:02:54 2013 -0700 - - Remove Skill textures - -commit 43ea5ff605e785f0679761dc0c6bcf0b03d0dffe -Author: mDiyo -Date: Wed Sep 11 12:14:42 2013 -0700 - - Remove extra book recipe - -commit 9722c0623fd84a6e9537efe9c3a303b2cea3610e -Merge: 9b42cdd 30f4683 -Author: mDiyo -Date: Wed Sep 11 11:54:14 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 9b42cdd69594753b23837bf68f7647cf1dae7800 -Author: mDiyo -Date: Wed Sep 11 11:53:45 2013 -0700 - - Fix Jerky stacking, adjust saturation - -commit 30f4683fea9781969e3aa27e18670f4f4a8648c7 -Author: Sunstrike -Date: Wed Sep 11 19:47:18 2013 +0100 - - Don't mind me, being mildly OCD about formatting... - -commit 1de8fb43a6fe649742d670cc64b2aac37d009bdb -Merge: 5dc13cf 7867bcd -Author: Sunstrike -Date: Wed Sep 11 14:30:20 2013 +0100 - - Merge PR #176: Fixed leaf fletching dup (GraxRabble/master) - -commit 7867bcd04959153fb2928a1fd6332c378b515ba2 -Author: GraxRabble -Date: Wed Sep 11 04:21:27 2013 -0400 - - removed the hack and left only the vanilla leaf fix - -commit 9e3830a50b1cf62b93724e7546e5fd1cf544c2c9 -Author: GraxRabble -Date: Tue Sep 10 22:52:28 2013 -0400 - - Fixed leaf fletching dup - -commit 511f96dce621dcbaa79e36f9838a48f137527e88 -Author: Progwml6 -Date: Tue Sep 10 16:53:31 2013 -0400 - - add xcompwiz's mystcraft API to gitignore, as xcomp does not want it redistributed at this time - -commit 5dc13cf03c92cab7635347ac7e887740ce067aef -Author: Sunstrike -Date: Tue Sep 10 00:00:49 2013 +0100 - - Change _Sunstrike cape to point at different file. - -commit c125b0fdafd852b650ccb1693786619e66196d62 -Merge: febfa75 fd9828e -Author: mDiyo -Date: Mon Sep 9 11:34:13 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit febfa75011ddc26a7c291e56c4ece1e273a3c22a -Author: mDiyo -Date: Mon Sep 9 11:33:40 2013 -0700 - - Remove unused resources - -commit fd9828efd8ed3b9cf5b78a5a12e9315b71d2b7b7 -Merge: 2fbad7b 502f5a6 -Author: Sunstrike -Date: Mon Sep 9 10:04:36 2013 -0700 - - Merge pull request #172 from Vexatos/master - - de_DE language info for Jerky - -commit 502f5a6b90723215d6b643dad0994d7320e55496 -Author: Vexatos -Date: Mon Sep 9 18:04:12 2013 +0200 - - Added "Charqui" - -commit 2fbad7bd7c17a5a484f8487f5b6772c0397f7378 -Author: Arthur Uzulin -Date: Mon Sep 9 21:27:13 2013 +1000 - - Proper fix for the landmine dupe - - Fixed landmine dupe - -commit d66182cb2857766db145ceb2e8826dcb2c8f74eb -Author: Arthur Uzulin -Date: Mon Sep 9 21:21:30 2013 +1000 - - Temporary fix for landmine dupe - - Temporarily fixed the landmine duplication, this fix is in no way within - my standards and will be looked into properly later. - -commit 09685b25e226d4a0c6dee11ea1941089e9536ef7 -Merge: 20cbb58 154bf98 -Author: mDiyo -Date: Sun Sep 8 22:41:57 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 20cbb58021a49e97ac1233d2070b994c935dd1d6 -Author: mDiyo -Date: Sun Sep 8 22:41:47 2013 -0700 - - More talky talky - -commit 154bf98b6249ae838207319eaa09a54ccfcac919 -Merge: 17dfd0e 1f6f7f2 -Author: Zach -Date: Sun Sep 8 22:08:34 2013 -0700 - - Merge pull request #168 from progwml6/master - - fix bug with dimension blacklist check - -commit 1f6f7f2de5876992d89188f89f2feb03cd6a83fe -Author: Progwml6 -Date: Mon Sep 9 01:08:03 2013 -0400 - - fix bug with dimension blacklist check - -commit 17dfd0e45e424fe17e6c7506631afa78080e3cd4 -Merge: 48929c1 8464d34 -Author: Zach -Date: Sun Sep 8 22:01:36 2013 -0700 - - Merge pull request #167 from progwml6/master - - add config option to only generate slime islands in the overworld - -commit 8464d34e94d59e0f4b5deeb2b12d603bfa3520ae -Author: Progwml6 -Date: Mon Sep 9 00:59:06 2013 -0400 - - add config option to only generate slime islands in the overworld - -commit 48929c1bb07f5a2fdedc70dee539a2a38dd0d699 -Merge: 856b313 5b22f45 -Author: Zach -Date: Sun Sep 8 21:29:23 2013 -0700 - - Merge pull request #166 from progwml6/master - - adding dimension blacklist for slime islands, including support for twilight forest via its configs, and other dimensions via TiC config - -commit 5b22f452aa2f6f6a143dbf12d2f760fff4dcfcea -Author: Progwml6 -Date: Mon Sep 9 00:27:33 2013 -0400 - - fix bad initialization of slimeislanddimblacklist config - -commit 7e7266d4a0fad6ea933eda979c9b19fbd74e062a -Author: Progwml6 -Date: Sun Sep 8 23:45:52 2013 -0400 - - add all negative dimensions to slime island blacklist - -commit 856b31361d07933fd972717fcd5a83aa3c4e6e17 -Merge: 83c9127 07856db -Author: mDiyo -Date: Sun Sep 8 20:37:41 2013 -0700 - - Fix merge conflicts - -commit b5fd27013c7c7ea052df727b62830dc60a3eb8a7 -Author: Progwml6 -Date: Sun Sep 8 23:36:25 2013 -0400 - - add in parsing of TwilightForest config to get its dimension ID, addition of blacklist for slime island generation in ages, config option to add to that list. - -commit 83c9127ba173729606577fc2fd0565c0425e5629 -Author: mDiyo -Date: Sun Sep 8 19:23:22 2013 -0700 - - Add Jerky, fix Drying Rack - -commit 07856db6895b9d519149f8279c776cdab8aa45cc -Author: Sunstrike -Date: Mon Sep 9 01:57:04 2013 +0100 - - Make MFR compat a child mod to reduce mod list clutter. - -commit fc56cea508200c7e775a56b3c09daaeaedd69b94 -Author: Sunstrike -Date: Mon Sep 9 01:49:31 2013 +0100 - - Remove extraneous mcmod.info - -commit 19eee410d719f70ac8c8faab026146a0afb7a165 -Merge: e1f4fe8 44afbcd -Author: Zach -Date: Sun Sep 8 17:51:49 2013 -0700 - - Merge pull request #165 from progwml6/master - - adding prog and sun to capes usiing fuj1n's tc logo cape - -commit 44afbcd65472603b7c3ae2607345ce57947a030b -Author: Progwml6 -Date: Sun Sep 8 20:50:36 2013 -0400 - - adding prog and sun to capes usiing fuj1n's tc logo cape - -commit e1f4fe8f730a087521c11ba67f722d027121e7ea -Merge: 439cb04 0cdc722 -Author: Zach -Date: Sun Sep 8 17:35:06 2013 -0700 - - Merge pull request #164 from progwml6/master - - updating both mcmod.info files for consistency, and to reflect expanded ... - -commit 439cb0462be2744869f93f5679fb9c237f81ff5c -Author: Sunstrike -Date: Mon Sep 9 01:34:25 2013 +0100 - - Change git tag format in Ant (no more 1.4.dev... stuff) - -commit 0cdc722099cc60063c5e6e1300055146b77170aa -Author: Progwml6 -Date: Sun Sep 8 20:31:55 2013 -0400 - - updating both mcmod.info files for consistency, and to reflect expanded dev team - -commit ad83893e9f5f64c651c9b5b72f0ffd72dbf0bf28 -Merge: ed6946d 802fb3a -Author: mDiyo -Date: Sun Sep 8 17:05:54 2013 -0700 - - Merge pull request #162 from Sunstrike/fc-npe - - Fix fake player NPE (as found by Soaryn) - -commit ed6946d712860043d348154fe2360f8a6ba04329 -Merge: 0b4ab68 c41d9f7 -Author: mDiyo -Date: Sun Sep 8 17:05:45 2013 -0700 - - Merge pull request #163 from progwml6/master - - adding BOP api with Amnet's permission in order to allow for adding TiC ... - -commit 802fb3a15b5af8cfb9329232dae5a4363f631549 -Author: Sunstrike -Date: Sun Sep 8 23:09:32 2013 +0100 - - Fix fake player NPE (as found by Soaryn) - -commit c41d9f70faaaba17b42b2e9af9a2ee37aa5edda7 -Author: Progwml6 -Date: Sun Sep 8 16:56:43 2013 -0400 - - adding BOP api with Amnet's permission in order to allow for adding TiC compatibility - -commit 0b4ab68341984fc3e2777b6ebafa8196bb9bae30 -Author: Arthur Uzulin -Date: Sun Sep 8 19:03:58 2013 +1000 - - Replaced Init with EventHandler in MFRCompat - -commit c3ebcf44b31b9826d594f5b79c61f2bae5a0586b -Author: Arthur Uzulin -Date: Sun Sep 8 18:51:19 2013 +1000 - - Fixed hoppers extracting the frypan - - Fixed hoppers being able to extract the frying pan making it (hopefully) - impossible to extract/place items into the invisible frying pan slot of - the placed frying pan. - -commit 6ed986c3e190527a85c3aba1e4f22d532fafbb2b -Author: fuj1n -Date: Sun Sep 8 16:20:26 2013 +1000 - - Update README.md - -commit ea1d2f8494c3466aafcd6419067029838438418b -Author: fuj1n -Date: Sun Sep 8 16:20:11 2013 +1000 - - Update README.md - -commit 8be2193142ce035d4f394eb2d796367f2bfe1378 -Author: fuj1n -Date: Sun Sep 8 16:19:21 2013 +1000 - - Update README.md - -commit 3fc5392f6a18f7f9fc013a278129cb0555b0597a -Merge: d8ca94b 1180f60 -Author: mDiyo -Date: Sat Sep 7 13:38:58 2013 -0700 - - Merge pull request #159 from progwml6/master - - remove MC version from readme - -commit 1180f60b0feb149a3a8137a9a438a40585857451 -Author: Progwml6 -Date: Sat Sep 7 16:37:13 2013 -0400 - - remove MC version from readme - -commit d8ca94b5ec70fd6037b0ed94a9e82c0ee0f7965e -Merge: 19cf727 8ccb0df -Author: mDiyo -Date: Sat Sep 7 13:31:09 2013 -0700 - - Merge pull request #158 from progwml6/master - - modify readme.md to reflect new build system along with issue reporting ... - -commit 8ccb0dff1b596f65c8653acc267a58f475be2f90 -Author: Progwml6 -Date: Sat Sep 7 16:28:19 2013 -0400 - - modify readme.md to reflect new build system along with issue reporting requirements - -commit 19cf7275f2264243bdcf395dbf1dc4dc52ea0664 -Merge: 931b1e7 5c78255 -Author: mDiyo -Date: Sat Sep 7 13:11:40 2013 -0700 - - Merge pull request #155 from invinctus/master - - Implemented IFluidHandler on Smeltery Drain - -commit 931b1e7acb08f4c059d7b499c62acdfb41a8e3ac -Merge: 81c0ff7 700d9a2 -Author: mDiyo -Date: Sat Sep 7 13:04:46 2013 -0700 - - Merge pull request #142 from tycho/master - - A couple fixes - -commit 81c0ff77203fc130893397ef92ef9c9e28ac2165 -Merge: 456adb9 f5de941 -Author: fuj1n -Date: Sat Sep 7 04:52:52 2013 -0700 - - Merge pull request #157 from progwml6/master - - Updated MCP mappings, and corresponding necessary build.xml changes for newest forge - -commit f5de941b2ef114ac871a5f909155764aed50a12b -Author: Sunstrike -Date: Sat Sep 7 12:10:40 2013 +0100 - - Fix broken slimes (that sounds weird...) - -commit de50db7165a334a45e4aa21fc3da04561c05bfcb -Author: Progwml6 -Date: Sat Sep 7 01:35:45 2013 -0400 - - Update build.xml (Ant) for newer Forge. Adjust MCP mappings as needed. - -commit 456adb947b3c2ab4a7a7363e7f78230d635446f4 -Author: Arthur Uzulin -Date: Sat Sep 7 14:52:18 2013 +1000 - - Fixed that one annoying pixel in every clear... - - ...glass texture - -commit 5c782555567b47564b101e1c63799f6e5772a3e2 -Author: invinctus -Date: Fri Sep 6 12:34:46 2013 +0100 - - Implemented IFluidHandler on Smeltery Drain - -commit 71ba72ababc003cc2e91f71cad550525eb31f1f9 -Author: mDiyo -Date: Thu Sep 5 12:59:58 2013 -0700 - - Knapsacks drop items in the proper spot - -commit 56c1cec850bfed23c7a356581881efcc88d18ce5 -Author: mDiyo -Date: Thu Sep 5 12:39:18 2013 -0700 - - Add Slime Channels, Bounce Pads, Reorganize landmine packages - -commit ce6605314a5392cd32e607e518f6da9ff79ca1dd -Author: mDiyo -Date: Wed Sep 4 20:26:43 2013 -0700 - - Re-add essence extractor block - -commit 700d9a2dffa97012109d1092ebecec7c6351c608 -Author: Steven Noonan -Date: Sun Sep 1 02:32:30 2013 -0700 - - LavaTankItemBlock: translate FluidName when rendering tooltip - - Without this, it would render with the untranslated string (e.g. "Contains - electrum.molten" or similar). - - Signed-off-by: Steven Noonan - -commit 7a9dbd703ca098b130056143b5204a5c6e28b247 -Author: Steven Noonan -Date: Sun Sep 1 02:30:55 2013 -0700 - - SmelteryLogic: don't crash when melting Endermen with a Smeltery - - A FluidStack was being incorrectly constructed, causing the game to bomb out - when ender fluid was added to the Smeltery. - - Signed-off-by: Steven Noonan - -commit 1229c80ba6dc3b0ede0ee17ce67fb428d8e4d1a9 -Author: mDiyo -Date: Wed Sep 4 19:22:51 2013 -0700 - - Update version number - -commit 0ae48431b343a1650dd98941bf9e2eb7606f9788 -Author: mDiyo -Date: Wed Sep 4 19:21:57 2013 -0700 - - Remove Light Aggregator - -commit 0e043af58da41136a98fc968954e746c7017b50e -Author: fuj1n -Date: Wed Sep 4 19:44:40 2013 +1000 - - Update capes.txt - -commit 30a30e128400ed30bc5a12178c62f94e42769362 -Author: mDiyo -Date: Tue Sep 3 07:24:26 2013 -0700 - - Update capes.txt - -commit 43e044ae969086fcc87a79ee30b8e0623132b11c -Merge: 63614e4 0a1376f -Author: mDiyo -Date: Tue Sep 3 05:21:07 2013 -0700 - - Merge pull request #150 from Zerokyuuni/master - - Oink - -commit 0a1376fe078fb78bf1e1b3e8b4b2a5beed51374e -Author: Zerokyuuni -Date: Tue Sep 3 08:09:48 2013 -0400 - - Oink - - Oink Oink SQUEEL... ALLOY! - -commit 63614e4db4723cad4ec3255e6008c98d5d97eb2d -Author: Arthur Uzulin -Date: Tue Sep 3 19:56:33 2013 +1000 - - Fixed the essence crystal being initialized twice - -commit e7a48cf2f48a3a2172d03c7b8b707ba45edda2ac -Author: mDiyo -Date: Mon Sep 2 07:07:00 2013 -0700 - - Update capes.txt - -commit cca9f90be4423d95f60d5702a14c46ebea39d80d -Author: mDiyo -Date: Mon Sep 2 06:47:17 2013 -0700 - - Update capes.txt - -commit f66ec7bb9140d674a19f5b40a2025e8e2b39c04b -Author: Arthur Uzulin -Date: Mon Sep 2 22:55:53 2013 +1000 - - Fixed #54 for casting basins - -commit 5cb0aa6776dd4dd007a50146996c67065eafd5dc -Author: Arthur Uzulin -Date: Mon Sep 2 22:38:06 2013 +1000 - - Fixed #54 - -commit a08e374249d91c884ad858e709981bb21e1185c1 -Author: Arthur Uzulin -Date: Mon Sep 2 22:25:42 2013 +1000 - - Fixed #131 - -commit 0acef0e990a921b0c42f72b5c82a3380be1e017e -Author: Arthur Uzulin -Date: Mon Sep 2 16:40:53 2013 +1000 - - Moved Polish translation to the new lang location - -commit b05bf01e69c9d32f5395b1df61e278777036b872 -Merge: 024970c cd3e5eb -Author: fuj1n -Date: Sun Sep 1 23:21:09 2013 -0700 - - Merge pull request #145 from UnekPL/master - -commit 024970c16ec22a86b7a4f8753320535f1c90e82f -Merge: 75c3689 087b33f -Author: fuj1n -Date: Sun Sep 1 23:16:43 2013 -0700 - - Merge pull request #144 from Sunstrike/restructure - - Create Ant build system for CI automation - -commit cd3e5eb24de817a5a0d85f7ea22845c31d2d4e2f -Author: UnekPL -Date: Sun Sep 1 21:39:37 2013 +0200 - - added pl_PL.xml - -commit 087b33feb72e01d375a58fe71e78bb9498935399 -Author: Sunstrike -Date: Sun Sep 1 15:31:28 2013 +0100 - - Restructure with build file (Ant) - -commit 8ce338dd587139b99937139982319f01f3ba16d1 -Author: Sunstrike -Date: Sat Aug 31 19:25:38 2013 +0100 - - Compile Access Transformer for autobuilds. - -commit 75c36890308c37dfc620d17d4020641bea311dfd -Merge: 7cf4194 86f1d15 -Author: mDiyo -Date: Sun Sep 1 05:08:07 2013 -0700 - - Merge pull request #141 from ZeroLevels/master - - Fixed some textural bugs. - -commit 7cf41948ce69ba920116003619ce683a0bfcb230 -Merge: aa8ea3a 274b2bf -Author: mDiyo -Date: Sun Sep 1 03:57:34 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit aa8ea3a9691af8a8542b141080ae7e557cb708cb -Author: mDiyo -Date: Sun Sep 1 03:40:08 2013 -0700 - - Add mcmod.info - -commit 86f1d155240d70d98370cef3e575bea49c51532a -Author: Zero -Date: Sun Sep 1 05:11:43 2013 -0400 - - Fixed some textural bugs. - -commit 274b2bf48f918a666bd10bcf3356092095a2045c -Merge: 5a1b74c 69e60cf -Author: fuj1n -Date: Sat Aug 31 19:07:44 2013 -0700 - - Merge pull request #140 from crafteverywhere/patch-2 - -commit 5a1b74cb9be379317d6facbabd4b70d0460debb5 -Author: fuj1n -Date: Sun Sep 1 12:07:07 2013 +1000 - - Update capes.txt - -commit 69e60cfe396696314efd5ab21516089ba45adb48 -Author: crafteverywhere <1196377271@qq.com> -Date: Sun Sep 1 05:40:56 2013 +0800 - - Update zh_CN.xml - -commit e0b414ed74f29cbfb6a2732a70bcf5e7d8d82a08 -Author: Arthur Uzulin -Date: Sun Sep 1 01:32:30 2013 +1000 - - A slightly improved collider for landmines - -commit 10ee101a40ffa67d110f4eb9320c859b31d8ec44 -Author: Arthur Uzulin -Date: Sun Sep 1 01:04:12 2013 +1000 - - Fixed more of the crafting station - - Fixed the last slot of the crafting station not dropping anything. - -commit 54d90662a9a6aafde71abb00cb22ae0d047a08a0 -Author: Arthur Uzulin -Date: Sun Sep 1 00:59:32 2013 +1000 - - Fixed crafting station duping - -commit 0b926258abf430a3dc4d077dd8c4810e4fde7a1a -Merge: 2789545 5f75981 -Author: fuj1n -Date: Sat Aug 31 06:15:41 2013 -0700 - - Merge pull request #135 from Vexatos/master - -commit 5f7598176e6d2c03f5fab4be593bc235034ac636 -Author: Vexatos -Date: Sat Aug 31 15:10:46 2013 +0200 - - Updated de_DE.lang after crazy rebase. - -commit 2789545d34c1147ca4d63b100aa29ffd17d0b3bf -Author: mDiyo -Date: Sat Aug 31 05:13:31 2013 -0700 - - Rebase! - -commit 316e703b906a2c084e756f92102938ab37b9c0f8 -Author: mDiyo -Date: Mon Aug 26 20:17:21 2013 -0700 - - Crystal block tweaks - -commit 498540c32a4df2b87572cfa3c6c1781103769976 -Author: mDiyo -Date: Mon Aug 26 13:53:13 2013 -0700 - - Arrow and Dagger behavior changes, Hammers respect silverfish blocks - -commit e2ea929c65822f02553b0a22d52988d06fceccf0 -Author: Vexatos -Date: Sun Aug 25 08:17:10 2013 +0200 - - Materials, tools and tool parts - -commit 4360dfaf1e92330a31d22a55e35f260a2a94941c -Author: mDiyo -Date: Sat Aug 24 22:36:19 2013 -0700 - - Light Aggregator - -commit adfd1117ebe9a16efa8ebc5e398744cfca9c6aa6 -Author: Anton -Date: Sat Aug 24 19:08:07 2013 +0400 - - Update TProxyCommon.java - -commit 6f3ddc86cb084ce4154a380638b290eae60d1587 -Author: Anton -Date: Sat Aug 24 19:03:39 2013 +0400 - - Update ru_RU.xml - -commit 9a052877e5ce60d094f9ff8218767b4e61f8eeb9 -Author: mDiyo -Date: Thu Aug 22 17:17:38 2013 -0700 - - Yesh? - -commit 6795c176c7cdd158c28e75233eb1628f6e6451a3 -Author: Arthur Uzulin -Date: Thu Aug 22 09:01:16 2013 -0700 - - Moved capes.txt and default capes to master - -commit e8a5bbef810a9fc66d956f5aaf671ce3e85efbb7 -Author: Arthur Uzulin -Date: Wed Aug 21 22:19:44 2013 -0700 - - Added recipe for landmines, removed WIP tag - -commit ec08bbfd9144cc0fc7f0abb4591f9ad1e8849c8b -Author: Arthur Uzulin -Date: Tue Aug 20 23:12:54 2013 -0700 - - Added capes for 1.5.2 - -commit c6113d5462001888a50bd8be8837c67bfa832034 -Author: Kieron Richardson -Date: Tue Aug 20 02:00:18 2013 +0100 - - Fix ru_RU.xml Formatting Issue - - Fix formatting issue on line 20 someone forgot to add "<" before closing "entry" - -commit eb48215764fc128fbcbbc7731c6ede2e9b6c3249 -Author: Vexatos -Date: Fri Aug 16 22:20:39 2013 +0200 - - Update de_DE.xml - - Updated to the latest changes. - - Pokémon for ever! - -commit 7991c0faaf6afe682dc6b92e5060c6e1d2b127d7 -Author: mDiyo -Date: Fri Aug 16 09:30:56 2013 -0700 - - Casting Channels - -commit 507d6fe37b2c752df4bdbc273c11e1acb1f6e9ab -Author: Vexatos -Date: Wed Aug 14 21:47:25 2013 +0200 - - Fixed a lot - - SQUASH! - -commit cc63430491aa21de3089c1ea9b15ff869630b9d6 -Author: Vexatos -Date: Tue Aug 13 22:20:24 2013 +0200 - - Update de_DE.xml - - Commit spam <3 - - (Some fixes) - -commit 96f11775b968fab6e3cdd648f21d85a5bb6c181d -Author: Vexatos -Date: Tue Aug 13 17:38:09 2013 +0200 - - Updated de_DE.xml - - Some fixes/improvements - -commit 489e708eed94ba0f00c4c4024527c0ff11abcd79 -Author: Vexatos -Date: Mon Aug 12 17:19:07 2013 +0200 - - Update de_DE.xml - - Oops. - -commit b6950e329bcebe1c43dfe621cd922047a3ea5147 -Author: Vexatos -Date: Mon Aug 12 17:04:23 2013 +0200 - - Update de_DE.xml - - Slimes, Slimes everywhere! - -commit 48c3288b8f17ab4b9a3532706022a5c6cdfe82b0 -Author: mDiyo -Date: Sun Aug 11 10:33:07 2013 -0700 - - Slime islands - -commit 1a584a74f2da1ff38edfe12c8f7337a66c6b3427 -Author: skyboy -Date: Sat Aug 10 14:26:51 2013 -0400 - - Return 10 for bow render passes - -commit 59386fbe71ae4a255e38e3edb3cd375b6d70ee68 -Author: skyboy -Date: Sat Aug 10 14:25:37 2013 -0400 - - Return false from hasEffect (prevent enchantment glow) - -commit 8c3597f7e742685f6d155c77761f3fcb863a3103 -Author: skyboy -Date: Sat Aug 10 14:22:39 2013 -0400 - - Render inventory items at layer 0 instead of -70 again - -commit 0dbd9bfdd1c361373513eadee0dfaa68526e26f9 -Author: Unh0lyTigg -Date: Sat Aug 10 07:48:35 2013 -0700 - - Add null check to LumberAxe.onBlockStartBreak - - https://github.com/mDiyo/TinkersConstruct/issues/83 - -commit a4da5c04783b720db5f84b0496e1782b19836b19 -Author: Vexatos -Date: Fri Aug 9 18:31:14 2013 +0200 - - Update de_DE.xml - - Update! - -commit 40b100f3456231b5c4ca7838dfa4be2f4b9c16ff -Author: mDiyo -Date: Fri Aug 9 08:47:40 2013 -0700 - - Added early essence extractor, liquid ender, updated lang files - -commit 1e994ebf953730f1d7b839a00f3a4aa847c2f001 -Author: mDiyo -Date: Fri Aug 9 00:56:25 2013 -0700 - - Fix console spam - -commit d0431ed9c8775cb19ff34fcd3e9c6947cb19fc83 -Author: skyboy -Date: Thu Aug 8 21:24:37 2013 -0400 - - Render arrows on drawn bows - -commit a0951aeb1904801072567240453183f776774faf -Author: skyboy -Date: Thu Aug 8 21:12:55 2013 -0400 - - Remove glint - -commit 732353fddd461a228c87205fc533526aabe1429f -Author: skyboy -Date: Thu Aug 8 20:43:08 2013 -0400 - - Fix indentation - -commit ce7821dd58c732ad00e62d739db6b11d18186237 -Author: skyboy -Date: Thu Aug 8 20:34:57 2013 -0400 - - Add custom item renderer for all tools - - fixes: bow FPS drop - -commit ad80a5eccee6776628b5d614a1817f2e93f27ee5 -Author: mDiyo -Date: Wed Aug 7 05:14:29 2013 -0700 - - Fix electric tool durability - -commit 1ec866f98de4eebf9d5bb9d71252354bd70e916f -Author: mDiyo -Date: Tue Aug 6 01:57:05 2013 -0700 - - Redstone connection rules for Drawbridge - -commit ef40140d2fb5a7009a30c279a0cc45d42276f294 -Author: Vexatos -Date: Tue Aug 6 10:10:55 2013 +0200 - - Update de_DE.xml - - Updated to equal latest en_US.xml - -commit 27b0bc70b89d0c6b0dca9e2949d8d2b36bca4102 -Author: mDiyo -Date: Tue Aug 6 00:59:50 2013 -0700 - - Fix warded block duplication - -commit 861014f7cfe9a69e35638b1274c2e942d3445451 -Author: mDiyo -Date: Tue Aug 6 00:45:57 2013 -0700 - - Drawbridge and Crafting Station fixes - -commit 4ec9261b4199df9e485b1a9be87d8117b0210e06 -Author: mDiyo -Date: Mon Aug 5 13:36:19 2013 -0700 - - Crafting Station Start - -commit 99d7ccbd4db664b3d82afaec02d79f81e6f69814 -Author: Vexatos -Date: Mon Aug 5 12:37:24 2013 +0200 - - I found something... - - Who thought this must be ISO-8859-1 encoded?!?!? - -commit 22e7266d6580189dda59bf7fda524b941a1138b3 -Author: Anton -Date: Sun Aug 4 04:36:15 2013 -0700 - - Russian localization - -commit 1fde9592bbb6c4023e94450a801a9e70b514fd8d -Author: mDiyo -Date: Thu Aug 1 18:45:05 2013 -0700 - - Various bugfixes - -commit 1f220d00fdfd5731bf70c5e07222b89b797d678e -Author: crafteverywhere <1196377271@qq.com> -Date: Wed Jul 31 11:05:40 2013 +0800 - - Create zh_CN.xml - -commit 8f50854de8c445784680a27f4cacf502195f194e -Author: Vexatos -Date: Tue Jul 30 11:37:08 2013 +0200 - - Update de_DE.xml - - Updated to equal latest en_US.xml and very small fixes/improvements - - @philip98 Nice work so far! The translation is really good :) - -commit 7b474087c6537ddf0acfd17803e8903f2dfba0b0 -Author: mDiyo -Date: Sat Jul 27 20:08:11 2013 -0700 - - Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat - -commit 090d15efd06d80e5c409e12dac6c223228f8a9ed -Author: Philip Schl -Date: Wed Jul 24 17:02:10 2013 +0200 - - Adding german translation - -commit be9a6d14f2a706e6281c327c677cd6b1f4d9ef6b -Author: Vazkii -Date: Wed Jul 24 00:12:32 2013 +0100 - - Add null check to HarvestTool.onBlockStartBreak - - https://github.com/Vazkii/ThaumicTinkerer/issues/15 - -commit d641a8eed936125cb5acdea3aec9f1b1e1823c6c -Author: mDiyo -Date: Mon Jul 22 21:53:01 2013 -0700 - - Various bugfixes with broad mining tools and config additions - -commit ae124ac3d4d4e003f38f34beb7c59d54068fbd19 -Author: mDiyo -Date: Thu Jul 18 12:58:08 2013 -0700 - - Fix electric tools consuming electricity and change villager trades - -commit 03628e01d47b4a77cbae1cd411d344aa0b65f03b -Author: mDiyo -Date: Wed Jul 17 02:04:28 2013 -0700 - - 1.4.1 - -commit 6a7bf6d2a6f96a65e8f7d6d76267757ee2c35dca -Author: mDiyo -Date: Fri Aug 30 22:45:03 2013 -0700 - - Update capes - -commit 8f55a45877df1fec23adfd1ed9f97e0e1150be95 -Merge: 2db4ccd d91737d -Author: mDiyo -Date: Tue Aug 27 18:11:54 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 2db4ccd4c7891282b1af5561ca7ee2621af856c1 -Author: mDiyo -Date: Tue Aug 27 18:11:13 2013 -0700 - - Various fixes involving projectiles and tool speed - -commit d91737dc502a79d5b3d6d95614c7adb4dda928de -Author: Arthur Uzulin -Date: Tue Aug 27 20:02:56 2013 +1000 - - Disabled capes for players with GLSL shaders - - Fixes #126 - -commit 0f069787c441daeb285ce51aff2ef1acede3dc56 -Merge: dd29169 9262a68 -Author: mDiyo -Date: Mon Aug 26 20:20:32 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 9262a68963219c012e23d71623cc35012e2c0ce1 -Merge: d755d52 fc1fe39 -Author: fuj1n -Date: Mon Aug 26 15:40:35 2013 -0700 - - Merge pull request #125 from Vexatos/16working - -commit fc1fe39755c08019078153c5462fad876c8ff847 -Author: Vexatos -Date: Mon Aug 26 19:09:54 2013 +0200 - - Updated COMPLETELY asynchronous file. - -commit d755d526cf385f9a846846c68c5c723c88b81074 -Author: Arthur Uzulin -Date: Tue Aug 27 01:09:03 2013 +1000 - - Fiery bowstring - - A little more of Natura integration, Fiery bowstring fires arrows - slightly faster having a slightly slower pull speed, the fiery bowstring - is made from fiery string dropped by Heatscar Spiders. - -commit 6b16b41ffd9a50b9e7156bebf8ddc2bfb8a6677b -Merge: bc1dea9 a83ab81 -Author: fuj1n -Date: Sun Aug 25 03:23:08 2013 -0700 - - Merge pull request #122 from VeryBigBro/patch-1 - -commit a83ab81b91af1f4a1680eed8703092400f55c5c0 -Author: Anton -Date: Sat Aug 24 18:34:04 2013 +0400 - - Update zh_CN.xml - -commit ee1960cafa10a53da89221b75d2ce20e460be8a6 -Author: Anton -Date: Sat Aug 24 18:33:20 2013 +0400 - - Update de_DE.xml - -commit 78ace1dc1858111729216f8cc28691168ad0daf0 -Author: Anton -Date: Sat Aug 24 18:32:19 2013 +0400 - - Update en_US.xml - -commit bdfc9c6520d9c4b0f8c0a178c4eb2470e9ff4a32 -Author: Anton -Date: Sat Aug 24 18:23:28 2013 +0400 - - Update ru_RU.xml - -commit bc1dea9b5f766979a973f19ac64f9cc9cf9d9193 -Author: Arthur Uzulin -Date: Fri Aug 23 22:20:53 2013 -0700 - - Added cape reload button [F12] - -commit fc66618e5f215f1cc5158673f82dd114e5a7f284 -Author: Arthur Uzulin -Date: Fri Aug 23 19:58:48 2013 -0700 - - Fixed the sideways landmine crash - -commit dd2916934b6aae84e0abd718fe48cd393eee718d -Merge: 551f901 0b3ab90 -Author: mDiyo -Date: Thu Aug 22 17:34:13 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 551f901ad3efcd0e1f395611b21698d87d383693 -Author: mDiyo -Date: Thu Aug 22 17:25:14 2013 -0700 - - Fix ore dicitonary entries for tool rods - -commit 0b3ab90131450a01ecde2295ff1e446f9e6d7e9c -Merge: 18082f7 f1050a7 -Author: mDiyo -Date: Thu Aug 22 17:04:13 2013 -0700 - - Merge pull request #120 from artdude543/16working - - Fix ru_RU.xml Formatting Issue - -commit f1050a7b2f2e896895459405fea448b3f25ab84e -Author: Kieron Richardson -Date: Thu Aug 22 23:11:58 2013 +0100 - - Fix ru_RU.xml Formatting Issue - - Fix formatting issue on line 20 someone forgot to add "<" before closing "entry" - -commit 18082f775d2d8d8aa34fe67ba771c2e6ab30edfb -Merge: 77ff0b7 f8fd360 -Author: mDiyo -Date: Wed Aug 21 18:31:30 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit f8fd360ab244e2748507d91f5ceaf1226f7acc25 -Author: Arthur Uzulin -Date: Thu Aug 22 09:29:58 2013 -0700 - - Fixed all the github cape links - -commit 838fcbb3838655296c2888408e6c84d20b40c5ae -Author: Arthur Uzulin -Date: Thu Aug 22 09:23:53 2013 -0700 - - Update capes.txt - test 3 - -commit 6504389cf77ee3ef5d5b3db6b46673e61f9f97e3 -Author: Arthur Uzulin -Date: Thu Aug 22 09:19:53 2013 -0700 - - Update capes.txt - test 2 - -commit ce2cebc6920fd935df59d36bfc4d9e78e27ffb62 -Author: Arthur Uzulin -Date: Thu Aug 22 09:07:46 2013 -0700 - - Update capes.txt for testing purposes - -commit 1743c74888a7792c36bdecab47084e0c75f86bae -Author: Arthur Uzulin -Date: Thu Aug 22 09:05:16 2013 -0700 - - Moved capes to master - -commit 77ff0b70d620e6156040a6cb15b83de79ce5a5f1 -Author: mDiyo -Date: Wed Aug 21 18:31:05 2013 -0700 - - Disabled enchant shine on tools - -commit 3fb6e9c739b6d29354d0f9562640bc77f0f7e7cc -Merge: d6711d0 eb7fd0e -Author: mDiyo -Date: Wed Aug 21 15:55:12 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit eb7fd0e7038985326c68584a47dbc8e320e68a99 -Author: fuj1n -Date: Wed Aug 21 15:52:18 2013 -0700 - - Update capes.txt - -commit b3eced2ebbca3cc1d1cd5fbc57561c066326a117 -Author: Arthur Uzulin -Date: Wed Aug 21 21:44:46 2013 -0700 - - Crafting recipes for landmines - - At least temporary, may be permanant - -commit f65b8ce7b91dc8250f07ff16e45eb9db93726354 -Author: Arthur Uzulin -Date: Wed Aug 21 18:20:44 2013 -0700 - - Capes now pre-load at runtime - -commit d6711d0c039a73c0b236a817f3cb1d9a0f0ce847 -Author: mDiyo -Date: Wed Aug 21 15:46:14 2013 -0700 - - Switch to older renderer for tools - -commit 340e4e23701d7c3d69685bb1d54a95930695a6e1 -Merge: 7b1c0c8 b3eced2 -Author: mDiyo -Date: Wed Aug 21 14:45:16 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 7b1c0c83d634959f44e483a8f3d3e9096bc735a8 -Author: mDiyo -Date: Wed Aug 21 14:40:58 2013 -0700 - - Remove empty file - -commit 160b28acd8c5478b998e062e2fa03a73f7e54dd0 -Author: mDiyo -Date: Wed Aug 21 14:40:22 2013 -0700 - - Electrum and invar require ingots to make alloys - -commit ab3eb32219bc4db9ce403056dc8e92bf86be685c -Author: mDiyo -Date: Wed Aug 21 00:41:04 2013 -0700 - - Update capes.txt - -commit 071909bc7644a7eec9905d29f6c2315a56292d3c -Author: mDiyo -Date: Tue Aug 20 12:07:51 2013 -0700 - - Update capes.txt - -commit 1ded6a99e26e646f7c2d1f6342d8b0808ca866d4 -Author: Arthur Uzulin -Date: Wed Aug 21 00:06:51 2013 -0700 - - Fixed the resolution of default capes - -commit a57ca60abff737d624d1215f1d66846274810e81 -Author: Arthur Uzulin -Date: Wed Aug 21 00:00:31 2013 -0700 - - Added HD capes - -commit 11116b1455e7fcb7bb5f2f78ae8508cb12a41452 -Author: Arthur Uzulin -Date: Tue Aug 20 21:35:50 2013 -0700 - - Added a config option for connected textures - -commit d9c9cca2988e6d5262d5c37e62d8acbbc98cf130 -Author: fuj1n -Date: Tue Aug 20 03:43:04 2013 -0700 - - Update capes.txt - -commit 200405dd9ae071658c0f3496eeb04cf3ceaca7ba -Author: Arthur Uzulin -Date: Tue Aug 20 20:38:55 2013 -0700 - - Transparency in capes - -commit d22b39335fb12012e509112ac3c954ddf2a2c0d3 -Author: mDiyo -Date: Mon Aug 19 19:56:54 2013 -0700 - - Update capes.txt - -commit 24187cf1d8c52e10a5cc97c93d4a0f3c9a6ad8f1 -Author: mDiyo -Date: Mon Aug 19 19:28:40 2013 -0700 - - Update Capes.txt - puu.sh is not permanent - -commit aeccce2839f7526cf8bac9f9698c1cd9510111b4 -Author: mDiyo -Date: Mon Aug 19 19:05:02 2013 -0700 - - Update capes.txt - -commit 69aaf0cd3e8e6dca68a0de727769a707267c2904 -Author: mDiyo -Date: Mon Aug 19 13:24:27 2013 -0700 - - Crafting tables make tool stations - -commit f6eca78f15537d7eae0ae0d9eeeaf93d3f217d6c -Author: mDiyo -Date: Mon Aug 19 11:30:24 2013 -0700 - - Fix tabs being in the wrong place - -commit 10cb3309c0e14b081d3847f5333a6d0aa85b715b -Author: mDiyo -Date: Mon Aug 19 10:53:12 2013 -0700 - - Update capes.txt - -commit b330e166729887e44e16f602ba50f00e798375b5 -Author: mDiyo -Date: Mon Aug 19 10:49:36 2013 -0700 - - Add default capes - -commit b107dba11aed800804a56d09f84ab7c57e355e43 -Merge: 8fb9e2f 73f018f -Author: mDiyo -Date: Mon Aug 19 10:48:33 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 8fb9e2f3596b3e42c87a1537e7e1472093b232ac -Author: mDiyo -Date: Mon Aug 19 10:47:49 2013 -0700 - - Add default capes - -commit 73f018fcb766c698dbae689e34c22182fab4df4e -Author: mDiyo -Date: Mon Aug 19 10:07:08 2013 -0700 - - Update capes.txt - -commit c9e7ecd95951abf0db27aedde8d3fb863ac6d094 -Author: mDiyo -Date: Mon Aug 19 09:55:28 2013 -0700 - - Update capes.txt - -commit fbe1f4eb228ccc5e01edbb13916375d1eae6117e -Merge: 911a0f9 348fbd0 -Author: mDiyo -Date: Mon Aug 19 09:30:13 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 911a0f97845270113418985946edee23fa59ca5d -Merge: 5a1c669 499aabe -Author: mDiyo -Date: Mon Aug 19 09:30:01 2013 -0700 - - Merge conflicted versions - -commit 348fbd0754a9a5befc7a96ade2e2ea6ff94d7adc -Merge: 499aabe b7a3fd3 -Author: mDiyo -Date: Mon Aug 19 09:29:24 2013 -0700 - - Merge pull request #112 from Vexatos/16working - - Equalized de_DE.xml + addition - -commit b7a3fd35dbf7c7e187359917ab81b97dd47ff4ec -Author: Vexatos -Date: Mon Aug 19 18:27:24 2013 +0200 - - Equalized de_DE.xml + addition - -commit 5a1c6697acd120437fa1dd4c52bdba36afd0a253 -Author: mDiyo -Date: Mon Aug 19 09:11:30 2013 -0700 - - Remove oddly placed names in random files - -commit e78100c49e1efad0fc84a6997634ab8c7d976af9 -Author: mDiyo -Date: Mon Aug 19 09:08:54 2013 -0700 - - Change tab registry to srgnames - -commit 499aabe952987c373f3e01ff1021d955005c6f4b -Author: Arthur Uzulin -Date: Sun Aug 18 19:58:36 2013 -0700 - - Added frypan rotation - -commit b410720aab5461b339a9154d5ac45d07073e385d -Author: Arthur Uzulin -Date: Sun Aug 18 19:15:22 2013 -0700 - - Added a missing space - - Sorry for the commit spam - -commit e7ebb8a22a6d879a0fd9554a81107570d2f8ffd2 -Author: Arthur Uzulin -Date: Sun Aug 18 19:13:54 2013 -0700 - - Removed debug message in cloak database builder - - Removed the nick + link console spam - -commit d03e890500afe0e5372f603373301142d7743d06 -Merge: 8a353f9 c3492c7 -Author: fuj1n -Date: Sun Aug 18 01:26:05 2013 -0700 - - Merge pull request #107 from Vexatos/16working - -commit c3492c7074cb2ce0d6e24c5c9e499f7c79d05753 -Author: Vexatos -Date: Sun Aug 18 09:10:14 2013 +0200 - - Updated capes.txt - -commit 8a353f9ba303152652110345a2965f16ee261693 -Author: fuj1n -Date: Sat Aug 17 23:38:37 2013 -0700 - - Update capes.txt - -commit 1b14af66d7325f53eeaa498c0021e972e2dd2d68 -Author: Arthur Uzulin -Date: Sun Aug 18 16:08:40 2013 -0700 - - Update capes.txt - -commit d786d59ae0b24b5d563289314a8fcb9bf5d721a0 -Author: Arthur Uzulin -Date: Sun Aug 18 15:24:25 2013 -0700 - - Made the capes even more efficient - - The thread is only started when it needs to download the cape - -commit 5c0ce31ed6cfec80b8163c69a54b1a3b9aab5ee1 -Author: Arthur Uzulin -Date: Sun Aug 18 15:13:11 2013 -0700 - - Cape loading is now managed by a thread - - This fixes a lag spike when loading capes - -commit ab38fd9689f4b0be9c5a215c1c10e661121c2fa3 -Author: Arthur Uzulin -Date: Sun Aug 18 14:30:55 2013 -0700 - - Added cloaks - -commit 2abf4d58f7a1ebb1e44c348cbccf9f2939028579 -Author: Arthur Uzulin -Date: Sun Aug 18 14:04:29 2013 -0700 - - Disabled cloak rendering for the time being - -commit 005e20cec4cd39a4d326d2ded83f4fa30201c6ac -Author: Arthur Uzulin -Date: Sun Aug 18 14:02:59 2013 -0700 - - Added capes.txt - -commit a0c34039044631c931983d3ecaa853cb2f8cdc2c -Author: Arthur Uzulin -Date: Sun Aug 18 14:00:25 2013 -0700 - - Got cloak to render(W.I.P) - -commit 31f2c8b0de01ac74f777fadda1cd194f119e7a2d -Author: Arthur Uzulin -Date: Sun Aug 18 12:24:36 2013 -0700 - - Removed unused import fixing a... - - ...crash when TC is launched without Natura - -commit 1bafebf933b82fd470ef200c2a216fce2376926a -Author: fuj1n -Date: Sat Aug 17 18:02:32 2013 -0700 - - Added a range check to TConstructBlock.getIcon - - Fixes http://pastebin.com/1hhKagD1 - -commit 21153791dddbc03fc66fdb405cab26f6c1b57c3c -Author: mDiyo -Date: Fri Aug 16 13:51:33 2013 -0700 - - Fix buckets, add crafting and wool slabs - -commit fcd041428cb2e6fb311972f37cd1ac60b459a6e4 -Merge: 7c452a9 55e2495 -Author: mDiyo -Date: Fri Aug 16 09:32:35 2013 -0700 - - Merge pull request #98 from micdoodle8/16working - - Added Tab Registry - -commit 55e24953b99be704dcde353e42a13c77d6efd1a4 -Author: micdoodle8 -Date: Thu Aug 15 01:31:12 2013 -0400 - - Added tab registry. - -commit 7c452a9d234f01d03ba5ee4c86006d46b9cf57ed -Merge: 0be9e67 f7e9370 -Author: mDiyo -Date: Tue Aug 13 10:45:09 2013 -0700 - - Merge pull request #94 from skyboy/16working - - Attempt to correc tool edge renderering for 1.6 - -commit f7e93702ff62930c04a7aaa4e37e15c6ea380b4a -Author: skyboy -Date: Tue Aug 13 13:41:46 2013 -0400 - - Attempt to correct edge renderering for 1.6 - -commit 2700765fb7258be81bda2ac4df2b6f60933ddd63 -Merge: e706483 0be9e67 -Author: skyboy -Date: Tue Aug 13 10:32:58 2013 -0700 - - Merge pull request #1 from mDiyo/16working - - 16working - -commit 0be9e6753eade59b928abd65513877404d1d2041 -Author: mDiyo -Date: Mon Aug 12 05:58:15 2013 -0700 - - Essence Extractor and Slime Islands - -commit aeb1fdb6a36c35323f5754237dd481f2d988a2f6 -Author: mDiyo -Date: Sun Aug 11 12:23:49 2013 -0700 - - ToolCoreRenderer - -commit 8a248c0f347e1804551b314ce5d30270e99ce5c8 -Author: Arthur Uzulin -Date: Mon Aug 12 00:19:27 2013 +1000 - - Fixed the tabs not working in obfuscated... - - ...environment - -commit e70648397740c915d7d43f928eaf6ca74b4a13b7 -Author: mDiyo -Date: Thu Aug 8 00:47:08 2013 -0700 - - Fix removal of vanilla tools - -commit 6192f25aec8c2e4418059f525e0281cef54ce053 -Author: mDiyo -Date: Wed Aug 7 19:06:26 2013 -0700 - - Fix most outstanding bugs - -commit 687a29e2218ae72af8be081573ffd30545bd0dbc -Merge: 6690c73 4de85ac -Author: mDiyo -Date: Wed Aug 7 06:06:08 2013 -0700 - - Merge pull request #76 from quok/16working - - Prevent moltenSilver and moltenLead from using 2 block ids. - -commit 4de85ac4418d9a2c8d7fb159524e5d811ff4aede -Author: Rich Edelman -Date: Tue Aug 6 10:44:01 2013 -0500 - - Prevent moltenSilver and moltenLead from using 2 block ids. - - moltenSilver and moltenLead were each listed twice in initProps(), the second listing using different block ids from the first. - -commit 6690c7357e315976ea18bb2c1d50ec215dfbeda0 -Author: Arthur Uzulin -Date: Tue Aug 6 23:08:45 2013 +1000 - - Fixed landmines stacking improperly - -commit fcf964d4d99551d71a971b121d2f7ac8444a721b -Author: mDiyo -Date: Fri Aug 2 02:12:48 2013 -0700 - - Null liquids make crashy crashy - -commit 4e9fb444882cc4a99cb0d6fcaf28dd25f3f13bd3 -Author: mDiyo -Date: Thu Aug 1 20:56:29 2013 -0700 - - update lang files - -commit cfe61da4e35e694b5c705482b11890cf020a1352 -Author: mDiyo -Date: Thu Aug 1 20:54:56 2013 -0700 - - Catch up to 1.5, fix heart rendering - -commit 76d72dfcb12a8dad6e4d426957b5fa0efff4f58b -Merge: d2b6bc1 6c24a9d -Author: mDiyo -Date: Thu Aug 1 18:46:19 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 6c24a9d99289ac4a154807909fc235dfee926459 -Merge: d512d67 cc62edc -Author: mDiyo -Date: Thu Aug 1 18:44:18 2013 -0700 - - Merge pull request #64 from PhineasSurrey/patch-1 - - Update ArmorExtended.java - -commit d2b6bc1e0aa6b5d6e40e57fd1d4d9526e946646b -Author: mDiyo -Date: Wed Jul 31 13:08:18 2013 -0700 - - Messed with skills, not the way to go - -commit cc62edca3bd492e617b0404b14961c017e904cd6 -Author: PhineasSurrey -Date: Mon Jul 29 11:18:33 2013 +0200 - - Update ArmorExtended.java - - Using attribute modifier instead of setting the attribute directly. - - Prevents clash with vanilla MC's health boost potion effect and other health modifying mods. - -commit d512d67679c51ffd224801daaccce8fad54bfc1a -Author: mDiyo -Date: Sun Jul 28 19:56:01 2013 -0700 - - Fix blue slimes, heart canisters - -commit 1b982c382685bf2602d98afd8b7be611bc55bf2c -Merge: 183a296 8a4e2c9 -Author: mDiyo -Date: Sun Jul 28 16:12:13 2013 -0700 - - Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working - -commit 183a2966e06551f37c5019f395bb20d68c2e0ab3 -Author: mDiyo -Date: Sun Jul 28 16:12:01 2013 -0700 - - Merge TContent - -commit 8a4e2c95bfac5c9d57e852a40c72dce487899676 -Merge: 4e920ec 1232bda -Author: mDiyo -Date: Sun Jul 28 16:08:39 2013 -0700 - - Merge pull request #63 from fuj1n/16working - - More bug fixes :D - -commit 1232bdaa530b57e1d939940745af5df32233b82a -Author: Arthur Uzulin -Date: Sun Jul 28 22:47:06 2013 +1000 - - Fixed Tool Station/Forge tool buttons - - This one was fun seeking out :p - -commit 84c4c38ac96686c7e87723b54a5268b417a31355 -Author: Arthur Uzulin -Date: Sun Jul 28 21:58:31 2013 +1000 - - Made torches place-able atop clear/stained glass - - ...just like vanilla glass - -commit 5e101b70b938b553240433b74dbfd7e4dd38a557 -Author: Arthur Uzulin -Date: Sun Jul 28 19:16:07 2013 +1000 - - Fixed the inventory tabs - -commit e5f36b57e39635087c6b8cea21b03223899caf33 -Author: Arthur Uzulin -Date: Sun Jul 28 18:41:22 2013 +1000 - - Fixed the localization of fluids - - strings in en_US.xml changed - -commit f99b21b8d6ce2f22736b1cde976d4d94041d410c -Author: Arthur Uzulin -Date: Sun Jul 28 18:22:52 2013 +1000 - - Fixed crashes with mighty smelting book - -commit 4e920ecf9dd4dc8dcd84538954a0358f063e16ef -Merge: a80fcbc e9f4e7d -Author: mDiyo -Date: Sat Jul 27 17:55:52 2013 -0700 - - Merge pull request #62 from fuj1n/16working - - Added landmine - -commit e9f4e7d44fa9cd3ab3d00f43aa15289db88c1137 -Author: Arthur Uzulin -Date: Sat Jul 27 21:57:41 2013 +1000 - - Made the top of tool forge/station solid - -commit abb40dc759946138761ac1adde289787568d1673 -Author: Arthur Uzulin -Date: Sat Jul 27 20:49:28 2013 +1000 - - Drawbridge slot now uses block to item mappings - - Made it so that the TConstruct block to item mappings are used in the - slots of the drawbridge. - -commit 770c72be39121b714a8a95922a2a8e7111069f6a -Author: Arthur Uzulin -Date: Sat Jul 27 20:21:29 2013 +1000 - - Various fixes - - Fixed images rendering incorrectly in the books and made the drawbridge - accept only real blocks(and only opaque blocks for camo) - -commit 81afd9c00ece98ccdc489a56483e758afc3985d9 -Author: Arthur Uzulin -Date: Sat Jul 27 17:03:16 2013 +1000 - - Added landmine - - Added the landmine to TConstruct source - -commit a80fcbce8699b72cc5135ebcd6aba7cd3faeb468 -Author: mDiyo -Date: Fri Jul 26 21:18:53 2013 -0700 - - 1.6.2 test - Finished liquids, added connected textures on glass - -commit 40c6f445a2146b384704f4606b56dd2d2413c300 -Author: mDiyo -Date: Thu Jul 25 03:18:26 2013 -0700 - - All errors removed, liquids changed for initial testing - -commit 01566fc10437da5c40e17ffd185229374a02e7b6 -Author: mDiyo -Date: Sat Jul 13 21:32:51 2013 -0700 - - Some liquids redone, half errors resolved - -commit 8dcffe3d5c8681d306d40b86e3bbfc8fa39c1bc4 -Author: mDiyo -Date: Sat Jul 13 03:48:08 2013 -0700 - - Initial fixes, still a long ways to go - -commit 35d495260ae3e5b1b7e14e5402b0c663d1e81a1f -Author: mDiyo -Date: Fri Jul 12 23:09:11 2013 -0700 - - Seared and Brownstone slabs - -commit 5a26a872ba16e309fe97dc09420cbccf7dc0ac6b -Author: mDiyo -Date: Fri Jul 12 16:52:15 2013 -0700 - - 1.4.0.RC1 - -commit 9c654ecb62bde10936b45d1bb3bbeb23924bec01 -Merge: 0b7b2fa 3fa1f13 -Author: mDiyo -Date: Thu Jul 11 22:48:03 2013 -0700 - - Merge pull request #44 from fuj1n/patch-1 - - Made the block mimic the light value of the camo block. - -commit 3fa1f1354ab6da949d46a2ac4efbb1ac98de7d2c -Author: fuj1n -Date: Fri Jul 12 15:44:29 2013 +1000 - - Update RedstoneMachine.java - -commit 7abe5cef86e3cc87e2aa8b83750ac10baaccf91c -Author: fuj1n -Date: Fri Jul 12 15:41:40 2013 +1000 - - Update RedstoneMachine.java - -commit fc867eddab2efa575ca6ff6f3e2bff62897d25ea -Merge: f0886e3 677227f -Author: fuj1n -Date: Thu Jul 11 22:37:18 2013 -0700 - - Merge pull request #1 from fuj1n/patch-2 - - Merge patch-1 with patch-2 - -commit 677227fefacb13153c8c443a6eb8c3e2ad0a3706 -Author: fuj1n -Date: Fri Jul 12 15:32:39 2013 +1000 - - Made the block get updated on inventory change. - -commit f0886e3785a9a542996d9ed87ab1e9f5b8a2630d -Author: fuj1n -Date: Fri Jul 12 15:29:31 2013 +1000 - - Made the block mimic the light value of the camo block. - -commit 0b7b2fa63c8c61628a3fbf1bd137040a2c09fb60 -Author: mDiyo -Date: Thu Jul 11 22:26:34 2013 -0700 - - Drawbridge, Igniter, and minor bugfixes - -commit 6af76e516eaf065c76925362847c6eaa88240995 -Author: mDiyo -Date: Thu Jul 11 00:07:02 2013 -0700 - - Formatter run on entire project - -commit c3d70616aa5af683bafc997d518eb94234d22729 -Author: mDiyo -Date: Wed Jul 10 20:25:31 2013 -0700 - - Tweaked arrow flight path and damage - -commit cdeece329a6412e286b1985ff0e9b2d50ff31d3e -Author: mDiyo -Date: Wed Jul 10 04:39:53 2013 -0700 - - Basic arrows - -commit b40106b3e91127c5d40d3a2e4e5e3d1ebb573601 -Author: mDiyo -Date: Sat Jul 6 13:51:40 2013 -0700 - - Shortbows - -commit 8313a4954802edfe6d3c185702ecc065201df743 -Author: mDiyo -Date: Mon Jul 1 21:52:44 2013 -0700 - - Functional drying racks - -commit b9acfe8260c0a90b53e61a8eb3b778c27b1f11cb -Author: mDiyo -Date: Mon Jul 1 19:35:21 2013 -0700 - - Recognize thaumcraft properly - -commit a7cabc5712969f0f73ebcab1cb7a477abb5bd411 -Author: mDiyo -Date: Mon Jul 1 16:47:26 2013 -0700 - - Thaumium tools and Drying Rack - -commit e71d506342572fb9da5492faa7fa5a4d830a27cd -Merge: 3657ecd f5ad93e -Author: mDiyo -Date: Sun Jun 30 18:52:49 2013 -0700 - - Merge pull request #38 from ZeroLevels/master - - Texture file optimizations. - -commit f5ad93eecf48ffea5dc4e57732f0fd1ceeee49eb -Author: Zero -Date: Sun Jun 30 21:46:26 2013 -0400 - - Optimized image files. Saved 646.31 KB (27.11%) - -commit 3657ecdbdaeec4e72a628491d1209396d17a5524 -Author: mDiyo -Date: Sun Jun 30 17:25:35 2013 -0700 - - Drawbridges and more drawbridges - -commit 801222dbc8ff24d4078085121e943e71c4e1d43c -Author: mDiyo -Date: Sat Jun 29 19:23:51 2013 -0700 - - Unmoved BookPage - -commit 915a4d09b16d0042304d3da09cd76176d36b3ce8 -Author: mDiyo -Date: Sat Jun 29 19:15:36 2013 -0700 - - Moved BookPage to the Library - -commit fe1fe4a78f198549b1dc98364a0db783b4b32a0b -Author: mDiyo -Date: Sat Jun 29 18:37:29 2013 -0700 - - More meltables and updated books - -commit 980181f7c915383f9e36a66955ed23644d22a527 -Author: mDiyo -Date: Sat Jun 29 14:35:44 2013 -0700 - - Rewrote books to have less hardcoded pages - -commit 7de061ba12e9bdbbf0738b8012e3e86d6190c53a -Author: mDiyo -Date: Sat Jun 29 09:40:48 2013 -0700 - - Fix Hammer and Excavator morphing metadata values - -commit c32b755bf528be660ffaeb7c6a0ded273a627bfe -Author: mDiyo -Date: Sat Jun 29 09:38:36 2013 -0700 - - Broad tool fixes, Drawbridge and Igniter - -commit aab20a98fcccec008d1e38ced34ffe2bd6daa827 -Merge: 3f9d95c 3929726 -Author: mDiyo -Date: Thu Jun 27 06:45:41 2013 -0700 - - Merge pull request #35 from Spyboticsguy/master - - Stone Torches, yay! - -commit 3f9d95c69425ea4f8a04f618a1498e0a3678e386 -Merge: 3eb0845 6beae8f -Author: mDiyo -Date: Thu Jun 27 06:45:03 2013 -0700 - - Merge pull request #33 from ScottKillen/BetterGravelOreSpawn - - Move gravel ore spawn earlier in biome decoration - -commit 3eb08456b1ad3cd92281ed7075b1396044cfcd67 -Author: mDiyo -Date: Thu Jun 27 06:43:54 2013 -0700 - - Knapsack bugfixes - -commit 3929726fd74a9e5061ab6bde84f51d64c4eb1e00 -Author: Tristen Allen -Date: Wed Jun 26 22:30:32 2013 -0400 - - Added Forestry Backpack stuff - - Stone Torches can now be placed in a Builder's Backpack. - -commit 6beae8f94451812a4eb2a7f0e920183ce7cba8a3 -Author: Scott Killen -Date: Wed Jun 26 00:08:02 2013 -0400 - - Moved gravel ore gen to generate after underground vanilla ores, but before any other biome decoration. Result is that gravel ore is now more integrated with terrain gen, covered with snow, etc. - -commit acb850352cd771c968321f60a6cb78045a7e33cb -Author: mDiyo -Date: Tue Jun 25 14:24:29 2013 -0700 - - Crystallinity - -commit 3be23a69a0730b880b6d1c422244e7292ea44a06 -Author: mDiyo -Date: Tue Jun 25 07:43:50 2013 -0700 - - Fix borked imports and misplaced model - -commit 5d66e0d739e82dfe4c57f080600f5b6ff638146a -Author: mDiyo -Date: Tue Jun 25 07:37:51 2013 -0700 - - Tooltips on Smeltery Gui, Fix tools not harvesting mod blocks properly and potion effects staying around - -commit 960dfedb94f7ee6348fc70c7be4eba1801c8396b -Author: mDiyo -Date: Fri Jun 21 19:32:43 2013 -0700 - - 1.3.5, Final update for 1.5.X - -commit deced730749a1b86c1d2a9dcee8d0229b855c066 -Author: mDiyo -Date: Fri Jun 21 05:44:30 2013 -0700 - - Update Readme - -commit 9843a83b7fded3157c12b1bc2cb644a42b1ee0e8 -Author: mDiyo -Date: Fri Jun 21 05:41:48 2013 -0700 - - RC4 - -commit 647e2e1cbf589fb3a8afe4a288fa2445608cd7a8 -Author: mDiyo -Date: Thu Jun 20 19:33:15 2013 -0700 - - RC2 - -commit 67dee13de1435c5b14c653b7f301167f9f9d4c6c -Author: mDiyo -Date: Thu Jun 20 18:13:55 2013 -0700 - - RC1 - -commit 3c69f05f19b3c6cba46c249e7368e14729f63786 -Author: mDiyo -Date: Thu Jun 20 16:22:12 2013 -0700 - - Tool recipes explicitly require tool rods - -commit 5eccf6a8489e3d10d7293cb8485fad22fb5468e0 -Author: mDiyo -Date: Thu Jun 20 14:44:49 2013 -0700 - - Add missing patterns to item directory - -commit 9fc9372afd23a2e2838d8373bcaca457df144fda -Merge: 03ea24e 7e9be34 -Author: mDiyo -Date: Thu Jun 20 00:27:45 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 03ea24ee58a6b7357bffc1b48b27130e8e294436 -Author: mDiyo -Date: Thu Jun 20 00:27:29 2013 -0700 - - Tool Forge Renderer Fix - -commit 7e9be3488444a6a3bae44802bcd7aee2fc510117 -Merge: 9c81ebb 5716367 -Author: mDiyo -Date: Thu Jun 20 00:26:00 2013 -0700 - - Merge pull request #30 from tmcgeorge/master - - In response to Issue #16 - -commit 9c81ebbac6b8d644c50a919303fc4815477b91ef -Author: mDiyo -Date: Wed Jun 19 18:58:37 2013 -0700 - - Bricks, Library updates, and tweaks all around - -commit d3cfea578f6a19ec7e76b6fb8ba38a385a9d1c2d -Author: mDiyo -Date: Tue Jun 18 02:57:36 2013 -0700 - - Crashy crashy fixit fixit! - -commit 57163675298de61a419669ce15ca7f348c280992 -Author: tmcgeorge -Date: Mon Jun 17 15:41:47 2013 -0500 - - Correct Stone Torch placement - -commit 1b338fe6fa472df8bdb5b6b9ef52fd1b3b40b8a6 -Author: mDiyo -Date: Mon Jun 17 13:13:11 2013 -0700 - - Smeltery Airblock cleanup - -commit 8e5f78aebf9384aab576405ee8f8436595e507cd -Author: mDiyo -Date: Mon Jun 17 13:12:19 2013 -0700 - - Smeltery Airblock cleanup - -commit f3191318f0fd5cd961ca4dbc368599077cc32b6f -Author: mDiyo -Date: Sun Jun 16 23:35:14 2013 -0700 - - Knapsacks and new modifiers - -commit 234a207b9189065d6f70e3fee74d0275dbc8ea6d -Author: mDiyo -Date: Fri Jun 14 21:21:14 2013 -0700 - - Added 5 new modifiers - -commit b88c7614837f70b092b452fb6eda40764ff57979 -Author: mDiyo -Date: Wed Jun 12 19:36:40 2013 -0700 - - Battleaxe - -commit af1a0f6308dc6c27ca08d8c80f51e98106d7145c -Author: mDiyo -Date: Tue Jun 11 16:36:06 2013 -0700 - - Tool Forge and tier 2 tools Start! - -commit 9637de4acd64c672036508bca991023ae34ea7ed -Author: mDiyo -Date: Tue Jun 4 22:49:44 2013 -0700 - - 1.5.1 - -commit 5f73c2152e1481e4ab70f9bda8aeb6d3206c97f0 -Author: mDiyo -Date: Sun Jun 2 06:46:42 2013 -0700 - - Begin skill creation - -commit 8a3dac472de905f34f7954157d71d57c70e64833 -Author: mDiyo -Date: Thu May 30 19:55:32 2013 -0700 - - Added APIs, moved Nitro Creeper to Natura - -commit 3bbd6a694702869898de99f0b72822b4fefec0b6 -Merge: 7bc28d5 00bf810 -Author: mDiyo -Date: Wed May 29 20:18:26 2013 -0700 - - Merge pull request #14 from Emys/master - - Include select MFR API classes for the MFR plugin - -commit 00bf810c4eb4850ead7558978cfcc0ba3452de81 -Author: Emy -Date: Wed May 29 21:11:10 2013 -0600 - - Include partial MFR API classes - -commit 7bc28d59a66219efd272bb018d0b59d6498d6678 -Author: mDiyo -Date: Wed May 29 19:50:36 2013 -0700 - - Dev48, MFR integration - -commit 4f21c093fa092d507860fd708b67423954e23237 -Merge: 14edf4c 523b94a -Author: mDiyo -Date: Wed May 29 17:57:09 2013 -0700 - - Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct - -commit 14edf4c2cf76208d99d5a6094d27607a37dc9a4c -Author: mDiyo -Date: Wed May 29 17:56:05 2013 -0700 - - Heart Canisters - -commit 523b94ad81310ed1c2d6d195cf299970c196e198 -Merge: d5c3d9e f5f7cc5 -Author: mDiyo -Date: Wed May 29 17:50:01 2013 -0700 - - Merge pull request #12 from Emys/master - - Adds oreberry/mob registration with MFR via API - -commit f5f7cc59355488bdcd8734e020fb8b631d7a8c2a -Author: Emy -Date: Sat May 25 21:53:54 2013 -0600 - - Register TConstruct bushes/mobs with MFR API - -commit 5f6990edafeb7e841fd6debe4e17cf2ab8d90b87 -Author: mDiyo -Date: Wed May 22 18:24:24 2013 -0700 - - Friendly Modifiers - -commit d5c3d9e3efe0c52e6f2eb54c6e8dc6f2716a33df -Author: mDiyo -Date: Tue May 21 01:08:44 2013 -0700 - - Oreberries and sound fixes - -commit 128457d55c2edccc364bcacc92a325bb41482e19 -Author: mDiyo -Date: Mon May 20 16:13:06 2013 -0700 - - Consistency - -commit 5bf2eac6463ded004ca8c2884ca45d0092c07851 -Author: mDiyo -Date: Wed May 15 19:13:19 2013 -0700 - - BlockSkinRenderHelper represents colors as colors - -commit cc15bc75780b8c385a4192b29c7feec14c00355a -Author: mDiyo -Date: Mon May 13 13:03:27 2013 -0700 - - Delete custom tool renderer - -commit 69630e2729757d038fb1cd3ed68d138f67ee8197 -Author: mDiyo -Date: Mon May 13 11:42:11 2013 -0700 - - 1.5.2 Update - -commit 34b48b29f033c899eea4475ba558333b0e22066e -Author: mDiyo -Date: Sun May 12 19:24:44 2013 -0700 - - Working sounds - -commit 979d876e0b298cac52cdf52b70e8f1bc212cbad5 -Author: mDiyo -Date: Sat May 11 10:52:09 2013 -0700 - - Tweaked rapier and living drops - -commit 1b5a237c9507287ef9c37a8d2ee6efb4d0ad248c -Author: mDiyo -Date: Wed May 8 15:21:44 2013 -0700 - - Tweakses - -commit e2b674153deb31981a67b89d88f69324b33c26cd -Author: mDiyo -Date: Sun May 5 11:46:58 2013 -0700 - - Tweaks - -commit 7772d7a1e36ebdfab6e61f18edfe260f7659aeab -Author: mDiyo -Date: Fri May 3 22:10:20 2013 -0700 - - Creative armor to inventory fix - -commit c869c2a73db77f92c24e030b95fde948299cd1f2 -Author: mDiyo -Date: Fri May 3 21:49:48 2013 -0700 - - Client inventory fix - -commit d132f1096f6949af7dcd2d797cf087ea06bec18e -Author: mDiyo -Date: Fri May 3 21:12:48 2013 -0700 - - 1.3.2 Stable - -commit 66f34f9be0df255d31f179180316cd835d30521c -Author: mDiyo -Date: Fri May 3 07:50:17 2013 -0700 - - Bricks! - -commit 0a69c4e38127a3d006184a819edec57a732fb4ad -Author: mDiyo -Date: Wed May 1 22:49:19 2013 -0700 - - Silky - -commit fc36d966c973f5e59bc6c5f79e29113fe8792c48 -Author: mDiyo -Date: Tue Apr 30 23:01:28 2013 -0700 - - Chiseling - -commit 318534091d4aeef419fea841f9d498aed5beaddb -Author: mDiyo -Date: Tue Apr 30 20:23:19 2013 -0700 - - Fix error message - -commit b547187c112a79b4955770a9e611fbc825d992d0 -Author: mDiyo -Date: Tue Apr 30 20:22:21 2013 -0700 - - Unified Casting Theory - -commit 87097b0b4253ceb4c624d2a9e2874c66655aad3a -Author: mDiyo -Date: Sun Apr 28 23:36:26 2013 -0700 - - Fix missing imports - -commit c9b7d56a2c5bda90d7cebd48e1a1e303552eb5cb -Author: mDiyo -Date: Sun Apr 28 23:27:30 2013 -0700 - - Remove empty guihandler - -commit 7bc75f2a72619e14cbf403ed1f3599602667b210 -Author: mDiyo -Date: Sun Apr 28 23:26:35 2013 -0700 - - Armor Gui - -commit ce1b9002baefcdf451759d6b4102371fc80d31ce -Author: mDiyo -Date: Sun Apr 28 02:37:19 2013 -0700 - - Refactor Library - -commit 4c96b5617ef9a2253d893c71943bb28c113de301 -Author: mDiyo -Date: Sun Apr 28 02:29:58 2013 -0700 - - Refactor, Reorganize, Redo! - -commit 8a9348bed0a2bfd72bf8c90e5e38332ee1b69fdb -Author: mDiyo -Date: Sun Apr 28 02:25:06 2013 -0700 - - Refactor, Reorganize, Redo! - -commit b3bac49dfb5633324ee376b9e1818fc99c31e82e -Author: mDiyo -Date: Sun Apr 28 00:10:12 2013 -0700 - - Heart Container - -commit a50062b488c203450bb5d12acfb6711f09da9cb9 -Author: mDiyo -Date: Sat Apr 27 20:33:21 2013 -0700 - - Casting Basin fix - -commit a0b30fa85161faba7d1ab2856f9eba5fd773a62b -Author: mDiyo -Date: Sat Apr 27 20:19:02 2013 -0700 - - doFill test fix - -commit 77904b70d46a9a7c0d3d30902748a35e3f228f4a -Author: mDiyo -Date: Sat Apr 27 19:51:37 2013 -0700 - - Casting table changes - -commit 0080dd934a3e78d80f0f450a7c99a3d2778a1b32 -Author: mDiyo -Date: Sat Apr 27 01:06:09 2013 -0700 - - Chisel Start - -commit 4c8b1720687d0cc85878d9fe41eae8f140682660 -Author: mDiyo -Date: Fri Apr 26 02:28:15 2013 -0700 - - Daggers - -commit 7b242f5141dcc20770c0b73fc4dc6f446cb53f81 -Author: mDiyo -Date: Wed Apr 24 18:04:13 2013 -0700 - - NEI Plugin things - -commit 751f16021f0109548ae38cc0c1abf6f7d4039d4b -Author: mDiyo -Date: Wed Apr 24 13:02:08 2013 -0700 - - Remove Armory - -commit 19a13775dd36c38dd0a88fe963124244ef97a0d1 -Author: mDiyo -Date: Wed Apr 24 11:41:22 2013 -0700 - - 1.3.0 - -commit d48561d0cdb72cdfed1c40f2a23fdfaa6ca1dc59 -Author: mDiyo -Date: Tue Apr 23 14:01:30 2013 -0700 - - Public getter for casting recipes - -commit 0821f7ba9fc59ccd75313acf00e5c029c9b064d3 -Author: mDiyo -Date: Tue Apr 23 13:59:05 2013 -0700 - - 1.3 release candidate - -commit fbf4a8084657723fa2ad70fa2c9c8e92cb0d3d0a -Author: mDiyo -Date: Mon Apr 22 19:16:25 2013 -0700 - - Armor Start - -commit 851302735bcbff3676aeea5f952f72bedb5edcaa -Author: mDiyo -Date: Mon Apr 22 01:56:20 2013 -0700 - - Village Generation - -commit 03a1f564c3d3dc62a375badcb5384103317c5ac2 -Author: mDiyo -Date: Sun Apr 21 18:28:12 2013 -0700 - - Oreberry Generation - -commit 55f9492ce413eef3f8ec50182a43df0af069b4f9 -Author: mDiyo -Date: Sat Apr 20 22:38:50 2013 -0700 - - Block cast, Smeltery bugfixes - -commit 76070970fc4de75c2f4ec7ea5dbaa61bbb18d01d -Author: mDiyo -Date: Sat Apr 20 11:31:35 2013 -0700 - - Worldgen Change - -commit 9e642bb13b81ff02ae32baa2ca04149ce4c41cf8 -Author: mDiyo -Date: Wed Apr 17 22:52:40 2013 -0700 - - Stability - -commit dd7d35021ecf14c2f08ecdcfadc44f950262921d -Author: mDiyo -Date: Wed Apr 17 07:08:37 2013 -0700 - - Update readme - -commit ae9ec7691c4f14ef5e1b8238dd837cb85bee3b91 -Author: mDiyo -Date: Tue Apr 16 14:05:29 2013 -0700 - - RC2 - -commit 3f9f90f2397b9eaa407431b1445d70a91441757a -Author: mDiyo -Date: Tue Apr 16 05:48:51 2013 -0700 - - RC1 - -commit 7847102fff14eba4d1668b927afd994af666312d -Author: mDiyo -Date: Mon Apr 15 11:04:52 2013 -0700 - - Bugfixes galore - -commit 31c54e3dee827a47d5d1b78affdaac533a403472 -Author: mDiyo -Date: Sun Apr 14 06:45:23 2013 -0700 - - Tweaks - -commit 4fb70de8a8bc7fc54e905ab01f50f9e9569af50e -Author: mDiyo -Date: Sat Apr 13 08:48:19 2013 -0700 - - Lapis Change - -commit d54db4d18a1a004bd96478452d238c1f5eded705 -Author: mDiyo -Date: Fri Apr 12 22:53:31 2013 -0700 - - Weapon Test 2 - -commit bdfb8d5c21cf23158ead2b6366d1b5c9710c123c -Author: mDiyo -Date: Fri Apr 12 06:04:45 2013 -0700 - - Weapon Test - -commit a4d318f0591ec569add96bf9a024c6c922ebc60a -Author: mDiyo -Date: Wed Apr 10 04:09:19 2013 -0700 - - Quartz Modifier - -commit 41a0e8007849332aede394ffcb3b2767a36bb7fd -Author: mDiyo -Date: Sat Apr 6 22:22:33 2013 -0700 - - Smeltery Fixes - -commit a2ae40c9307218fe0eba33d5fa49d95ba224ec6e -Author: mDiyo -Date: Sat Apr 6 14:07:23 2013 -0700 - - 1.2.16 - -commit b5f61b5367407647e43a4019909384b17b214125 -Author: mDiyo -Date: Fri Apr 5 04:49:22 2013 -0700 - - Working potion launcher - -commit e2ecb66ef2ffe8b754fc28351495a9a6dd234f96 -Author: mDiyo -Date: Thu Apr 4 21:02:49 2013 -0700 - - Broken potion launcher - -commit f453643ef720ac11bcca17ef417d88fa01690acf -Author: mDiyo -Date: Mon Apr 1 21:57:33 2013 -0700 - - 1.2.12 - -commit 0191732ab045e2153b554eb65f33b422ee1d4949 -Author: mDiyo -Date: Mon Mar 25 22:05:57 2013 -0700 - - 1.2.7 - -commit 51a69ffbd4f8cc065d7892135ddd3ced44ec5075 -Author: mDiyo -Date: Sun Mar 24 16:52:53 2013 -0700 - - Library Restructure - -commit c9ef3093a3862f3b0598e5ff0bb7d153247c67db -Author: mDiyo -Date: Sun Mar 24 14:59:41 2013 -0700 - - Fix worldgen, disable metallurgy stats - -commit 84705d04c380694471079ebeaf5f28997b387368 -Author: mDiyo -Date: Sat Mar 23 19:49:30 2013 -0700 - - Update Readme - -commit cfc45ece93dfdafad01caba9360d6427db4ebad5 -Author: mDiyo -Date: Sat Mar 23 19:48:43 2013 -0700 - - Update License - -commit 85c53e522fa0869ead7f86615dcca4fdd0297919 -Author: mDiyo -Date: Sat Mar 23 18:16:05 2013 -0700 - - Creative Commons Zero - -commit 5b707d93f0211b7ef8fc07fdbb7411b79a67513c -Author: mDiyo -Date: Fri Mar 22 17:34:08 2013 -0700 - - Vanilla bow nerf - -commit 57d8a3b405a3b1d094c99632df45d32ebb49fe23 -Author: mDiyo -Date: Thu Mar 21 17:38:04 2013 -0700 - - Blue slime balance - -commit 12b99e6f32bb7575156ec2b0c536b72323f03939 -Author: mDiyo -Date: Wed Mar 20 08:52:42 2013 -0700 - - Update Readme - -commit 49a265812960937ef3b09ed0e187a1582af5ef77 -Author: mDiyo -Date: Wed Mar 20 03:06:22 2013 -0700 - - Fix missing resources and double jump - -commit 51088c16bd48d9f710a9a0bd2f68115f079e0d46 -Author: mDiyo -Date: Tue Mar 19 06:03:09 2013 -0700 - - Readme update - -commit 767f56bf0acec74446b96dc01691841fd6c8dcea -Merge: 8d4f4b5 f42aceb -Author: mDiyo -Date: Tue Mar 19 05:58:11 2013 -0700 - - Merge fix - -commit 8d4f4b5da3179cbee71e42125ce92cea44785d93 -Author: mDiyo -Date: Tue Mar 19 05:27:02 2013 -0700 - - Beta - -commit ac2ce40172b7688a15bb2fe4680d1f50061dc71b -Author: mDiyo -Date: Sat Mar 16 23:54:39 2013 -0700 - - Catchup - -commit ace5f7b54d68cd5bc55ea26c7ce16fa6d61a6932 -Author: mDiyo -Date: Wed Mar 13 21:36:17 2013 -0700 - - Mostly working - -commit 1bb3c4cf7b4c4ac7dca28c6b11290bf9f883af76 -Author: mDiyo -Date: Mon Mar 11 00:05:11 2013 -0700 - - Initial crashless build - -commit f42aceb54c0d3287961fb95779dfd0765892da4e -Merge: 2f5d798 03b466a -Author: mDiyo -Date: Sat Mar 9 15:57:26 2013 -0800 - - Merge pull request #1 from agaricusb/maven - - Update MCP mappings and add Maven POM for faster decompile-free building - -commit 03b466a133cbb5a4be73ee87c3b60e488da55f40 -Author: Agaricus -Date: Sat Mar 9 14:20:23 2013 -0800 - - Add Maven POM - -commit da023a7669b8cc3fa51d84a025389fd4c041c03e -Author: Agaricus -Date: Sat Mar 9 14:11:57 2013 -0800 - - Update for final MCP 7.26a mappings - -commit 2f5d798753d1642eb5ee5f15270b6fe73bfdce3c -Author: mDiyo -Date: Sat Mar 9 03:49:04 2013 -0800 - - Last commit for 1.4.7 - -commit 01c4a785ebc4cd795da640a90ba8cbf0cd5f6ce2 -Author: mDiyo -Date: Sun Mar 3 20:25:43 2013 -0800 - - 1.1.20 - -commit 3cf838e03c5ca41468533113424c6615137697de -Author: mDiyo -Date: Sat Mar 2 20:07:54 2013 -0800 - - Multi-inventory - -commit aecc4e11c6ac06b922c9dd1aac251d1582504dff -Author: mDiyo -Date: Sat Mar 2 17:29:35 2013 -0800 - - Casting table underp - -commit 207de8184a47ae9f774e32f2cd0d23d75294b8b9 -Author: mDiyo -Date: Sat Mar 2 10:25:24 2013 -0800 - - pre 1.1.13 - -commit b913622dda44dae86ee3d3b76fe43a7d970e174e -Author: mDiyo -Date: Fri Mar 1 13:35:24 2013 -0800 - - Pre 1.1.11 - -commit 361a5bf603bd846530e63ef634f6c64e44b4a17a -Author: mDiyo -Date: Thu Feb 28 18:24:12 2013 -0800 - - Liquid Content - -commit 6b98bbb707f3e7221a62a4277f0a741d98a7a4c1 -Author: mDiyo -Date: Wed Feb 27 14:13:27 2013 -0800 - - Weekend getaway - -commit a001b2f66470c94a19011ba8fbb0512253979222 -Author: mDiyo -Date: Tue Feb 19 18:11:05 2013 -0800 - - The Nameless - -commit 52efa99d344e9ccdae10a0ca72e01939e5acdf3b -Author: mDiyo -Date: Mon Feb 18 00:56:20 2013 -0800 - - Tankard - -commit 933bad83406efb4e5192777294e3c801bba4bfb7 -Author: mDiyo -Date: Sat Feb 16 18:53:54 2013 -0800 - - Drain - -commit ba79620bcba28a795d4782b396ff1c0bc1bd9623 -Author: mDiyo -Date: Fri Feb 15 00:30:58 2013 -0800 - - Alloy Mixer - -commit 2e55905911a26297eab3fe8b46a1f39c95b32261 -Author: mDiyo -Date: Thu Feb 14 10:57:49 2013 -0800 - - Liquid Smeltery - -commit e9bd7f04b949a03dc960d0aaac398b8e9cf51a4d -Author: mDiyo -Date: Mon Feb 11 12:25:40 2013 -0800 - - Ripped down Worldgen - -commit a8386b634e07ee1d0ceb5f204e0e204365a4fa50 -Author: mDiyo -Date: Wed Feb 6 18:19:14 2013 -0800 - - liquids - -commit 4401066e81e661b6842c3ce2a8944c73798165ad -Author: mDiyo -Date: Mon Feb 4 12:37:37 2013 -0800 - - 1.1.2 - -commit 860803f337e37344aa389561489e56a27013b4e0 -Author: mDiyo -Date: Sat Feb 2 01:57:28 2013 -0800 - - We like readmes, yes we do~ - -commit e844381eda19bc8a6dce2c3b988c11a1629b90ae -Author: mDiyo -Date: Sat Feb 2 01:48:55 2013 -0800 - - Diary of a Tinker - -commit b89fbce46f3b920b9263e9b8b6fa8fd459ddd120 -Author: mDiyo -Date: Thu Jan 31 02:55:09 2013 -0800 - - Tool API 0.1 - -commit e6deb3dc4a99bfe06acc0ec71c9a5f279906ae66 -Author: mDiyo -Date: Tue Jan 29 23:27:49 2013 -0800 - - Custom Renderer Start - -commit 9dc02480c474e4690486ec3bccec17fe2ac964af -Author: mDiyo -Date: Sat Jan 26 01:52:26 2013 -0800 - - Fixes, pullcart start - -commit 0ddf7ae8b5def6741250a85e1dccdf18c588f4dc -Author: mDiyo -Date: Thu Jan 24 23:54:11 2013 -0800 - - 1.0.3 - -commit 7e7972f83e894afb44a3ea990bc17f9e4e0dfd46 -Author: mDiyo -Date: Wed Jan 23 17:53:32 2013 -0800 - - Release! - -commit ca72710c84c4ece9db34a0ba371ef6c8998e731d -Author: mDiyo -Date: Tue Jan 22 12:48:05 2013 -0800 - - Beta 1.1 - -commit a6fa0576ab400384a0bb9d27dad3f5332ba58a76 -Author: mDiyo -Date: Tue Jan 22 00:14:19 2013 -0800 - - Beta 1 - -commit a87babcf0b31ab2efa4c9cfa63a938a764a67529 -Author: mDiyo -Date: Mon Jan 21 14:02:28 2013 -0800 - - Modifiers, polish - -commit 37c88ce903cca1b4082c6bc2403c3b8570f5fc39 -Author: mDiyo -Date: Sun Jan 20 20:38:23 2013 -0800 - - Packets and Moss - -commit 7407d5af58ed3b7b6427e6c81f1424f0d508e8c8 -Author: mDiyo -Date: Sun Jan 20 01:14:32 2013 -0800 - - Smeltery - -commit 8e3684ae990e236948c77e076029e40f63c95b11 -Author: mDiyo -Date: Fri Jan 18 23:43:53 2013 -0800 - - Initial commit From 9659a1d3bad795090d157dbb34ec12c971b832ea Mon Sep 17 00:00:00 2001 From: samtrion Date: Tue, 29 Oct 2013 17:44:24 +0100 Subject: [PATCH 03/23] Removing config duplications --- src/tconstruct/util/config/PHConstruct.java | 51 +++++++-------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 696ddb76..afbec25a 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -1,10 +1,8 @@ package tconstruct.util.config; -import java.io.File; -import java.io.IOException; +import java.io.*; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; +import net.minecraftforge.common.*; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; @@ -49,7 +47,7 @@ public class PHConstruct beginnerBook = config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); alphaRegen = config.get("Alpha Behavior", "Regenerate HP from food", false).getBoolean(false); alphaHunger = config.get("Alpha Behavior", "Remove hunger", false).getBoolean(false); - + superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true); @@ -70,9 +68,6 @@ public class PHConstruct stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); - harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); - stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); - denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); //1467-1489 woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471); @@ -104,7 +99,7 @@ public class PHConstruct barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482); barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483); barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487); - + slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190); slimePad = config.getBlock("Slime Pad", 3191).getInt(3191); @@ -165,20 +160,7 @@ public class PHConstruct woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); //3246 castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); - - slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); - slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); - slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); - slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); - slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); - slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); - - meatBlock = config.getBlock("Meat Block", 3242).getInt(3242); - woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); - woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); - woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); airTank = config.getBlock("Air Tank", 3246).getInt(3246); - castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); woodenRail = config.getBlock("Wooden Rail", 3250).getInt(3250); manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); @@ -360,20 +342,19 @@ public class PHConstruct Property conTexMode = config.get("Looks", "Connected Textures Enabled", true); conTexMode.comment = "0 = disabled, 1 = enabled, 2 = enabled + ignore stained glass meta"; connectedTexturesMode = conTexMode.getInt(2); - - //dimension blacklist - cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist",new int[]{}).getIntList(); - slimeIslGenDim0Only = config.get("DimBlackList","GenerateSlimeIslandInDim0Only" , false).getBoolean(false); - slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); + //dimension blacklist + cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}).getIntList(); + slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false).getBoolean(false); + slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); - + //Addon stuff isCleaverTwoHanded = config.get("Battlegear", "Can Cleavers have shields", true).getBoolean(true); isHatchetWeapon = config.get("Battlegear", "Are Hatches also weapons", true).getBoolean(true); - + /* Save the configuration file */ config.save(); @@ -384,7 +365,8 @@ public class PHConstruct Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); - TConstruct.logger.severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); + TConstruct.logger + .severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); } } @@ -401,7 +383,7 @@ public class PHConstruct public static int searedTable; public static int castingChannel; public static int airTank; - + public static int craftedSoil; public static int oreSlag; public static int oreGravel; @@ -473,7 +455,7 @@ public class PHConstruct public static int slimeTallGrass; public static int slimeLeaves; public static int slimeSapling; - + public static int slimeChannel; public static int slimePad; @@ -704,9 +686,8 @@ public class PHConstruct //Experimental functionality public static boolean throwableSmeltery; - - + //Addon stuff public static boolean isCleaverTwoHanded; - public static boolean isHatchetWeapon; + public static boolean isHatchetWeapon; } From e4583c5e7ed00d87df70356f040d31c1ecf6b993 Mon Sep 17 00:00:00 2001 From: samtrion Date: Tue, 29 Oct 2013 20:04:11 +0100 Subject: [PATCH 04/23] Adding/Removing Recipes Removing recipe duplicates (Double or oreDictionary version available) Adding missing recipes for craftingSlabwood --- src/tconstruct/common/TContent.java | 59 ++++++++--------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 83fdd870..ff5266f2 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1,5 +1,9 @@ package tconstruct.common; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.*; + import java.lang.reflect.Field; import java.util.*; @@ -37,9 +41,6 @@ import tconstruct.library.util.IPattern; import tconstruct.modifiers.*; import tconstruct.util.*; import tconstruct.util.config.*; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.*; public class TContent implements IFuelHandler { @@ -1499,30 +1500,17 @@ public class TContent implements IFuelHandler chiseling.addDetailing(smeltery, 8, smeltery, 9, chisel); chiseling.addDetailing(smeltery, 9, smeltery, 10, chisel); - GameRegistry.addRecipe(new ItemStack(toolForge, 1, 0), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockIron); - GameRegistry.addRecipe(new ItemStack(toolForge, 1, 1), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockGold); - GameRegistry.addRecipe(new ItemStack(toolForge, 1, 2), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockDiamond); - GameRegistry.addRecipe(new ItemStack(toolForge, 1, 3), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockEmerald); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 4), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockCobalt")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockArdite")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 6), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockManyullyn")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 7), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockCopper")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 8), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockBronze")); - GameRegistry - .addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 9), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', "blockTin")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 10), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockNaturalAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 11), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockAluminumBrass")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 12), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockAlumite")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 13), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - "blockSteel")); + Object[] toolForgeBlocks = { Block.blockIron, Block.blockGold, Block.blockDiamond, Block.blockEmerald, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", + "blockTin", "blockNaturalAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; + + for (int sc = 0; sc < toolForgeBlocks.length; sc++) + { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', + toolForgeBlocks[sc])); + // adding slab version recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(craftingSlabWood, 1, 1), 'm', + toolForgeBlocks[sc])); + } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 0), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(blankPattern, 1, 1), 'r', new ItemStack(Item.redstone), 'd', new ItemStack(Block.dispenser))); //Drawbridge @@ -1540,7 +1528,6 @@ public class TContent implements IFuelHandler /* Crafting */ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.workbench); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 0)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); @@ -1784,7 +1771,6 @@ public class TContent implements IFuelHandler //Traps GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); - GameRegistry.addRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 0)); GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); GameRegistry.addRecipe(new ItemStack(barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); GameRegistry.addRecipe(new ItemStack(barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3)); @@ -1795,6 +1781,7 @@ public class TContent implements IFuelHandler //Slab crafters GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', new ItemStack(Block.workbench)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); @@ -1817,20 +1804,6 @@ public class TContent implements IFuelHandler GameRegistry.addShapelessRecipe(new ItemStack(slimeChannel, 1, 0), new ItemStack(slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, new ItemStack(slimeGel, 1, Short.MAX_VALUE), "slimeBall")); - - //Slab crafters - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', new ItemStack(Block.workbench)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 4)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 4), "b", 'b', new ItemStack(toolStationWood, 1, 5)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 10)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 11)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); } void setupToolTabs () From 9c24b0583852ac004112e3f34b088b5752f26876 Mon Sep 17 00:00:00 2001 From: samtrion Date: Tue, 29 Oct 2013 20:30:51 +0100 Subject: [PATCH 05/23] Adding Wool Slab recipes + oreDictionary Register --- src/tconstruct/common/TContent.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index ff5266f2..b1eeed63 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1769,6 +1769,18 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 6), "bbb", 'b', new ItemStack(smeltery, 1, 10)); GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 7), "bbb", 'b', new ItemStack(smeltery, 1, 11)); + // Wool Slabs + for (int sc = 0; sc <= 7; sc++) + { + GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); + GameRegistry.addRecipe(new ItemStack(woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); + + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); + } + GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, 0), "www", 'w', new ItemStack(Block.cloth, 1, Short.MAX_VALUE)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); + //Traps GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); @@ -1904,6 +1916,9 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("nuggetAlumite", new ItemStack(materials, 1, 32)); OreDictionary.registerOre("nuggetSteel", new ItemStack(materials, 1, 33)); + OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab1, 1, Short.MAX_VALUE)); + OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab2, 1, Short.MAX_VALUE)); + String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; for (int i = 0; i < matNames.length; i++) From dc6533ec633011f2d207f5ba7680b4e413144d5c Mon Sep 17 00:00:00 2001 From: Vexatos Date: Tue, 29 Oct 2013 21:05:14 +0100 Subject: [PATCH 06/23] Last minute changes --- resources/assets/tinker/lang/de_DE.lang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/de_DE.lang b/resources/assets/tinker/lang/de_DE.lang index 407e71d7..46d73e0f 100644 --- a/resources/assets/tinker/lang/de_DE.lang +++ b/resources/assets/tinker/lang/de_DE.lang @@ -96,7 +96,7 @@ block.fancybrick.obsidian.ingot.name=Schöner Obsidianziegel block.fancybrick.stone.road.name=Steinstraße block.fancybrick.stone.name=Schöner Steinziegel -block.rail.wood=Hölzerne Schiene +tile.rail.wood.name=Hölzerne Schiene tile.cloth.white.slab.name=Wollstufe tile.cloth.orange.slab.name=Orange Wollstufe @@ -488,6 +488,9 @@ death.two.smeltery=%1$s ist mit der Schmelzerei eins geworden death.three.smeltery=%1$s wird ein Meilenstein für unsere Revolution sein! death.four.smeltery=%1$s dachte, das Schwimmen in heißen Flüssigkeiten wäre eine ntry> +death.attack.Landmine=%1$s wurde von einer Landmine gesprengt. +death.attack.FireworkExplode=%1$s wurde von einer wilden Feuerwerksexplosion auseinandergerissen. + parttype.wood=Holz parttype.stone=Stein parttype.iron=Eisen From 4f341b82d1720517b1873c2b639ddd3fac0268fd Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 29 Oct 2013 18:06:55 -0400 Subject: [PATCH 07/23] add in config option to allow slime islands to generate in flat worlds --- src/tconstruct/util/config/PHConstruct.java | 31 +++++++++++---------- src/tconstruct/worldgen/SlimeIslandGen.java | 3 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 696ddb76..942bb223 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -49,7 +49,7 @@ public class PHConstruct beginnerBook = config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); alphaRegen = config.get("Alpha Behavior", "Regenerate HP from food", false).getBoolean(false); alphaHunger = config.get("Alpha Behavior", "Remove hunger", false).getBoolean(false); - + superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true); @@ -104,7 +104,7 @@ public class PHConstruct barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482); barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483); barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487); - + slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190); slimePad = config.getBlock("Slime Pad", 3191).getInt(3191); @@ -360,20 +360,20 @@ public class PHConstruct Property conTexMode = config.get("Looks", "Connected Textures Enabled", true); conTexMode.comment = "0 = disabled, 1 = enabled, 2 = enabled + ignore stained glass meta"; connectedTexturesMode = conTexMode.getInt(2); - - //dimension blacklist - cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist",new int[]{}).getIntList(); - slimeIslGenDim0Only = config.get("DimBlackList","GenerateSlimeIslandInDim0Only" , false).getBoolean(false); - slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); + //dimension blacklist + cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}).getIntList(); + slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false).getBoolean(false); + slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); + genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false).getBoolean(false); //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); - + //Addon stuff isCleaverTwoHanded = config.get("Battlegear", "Can Cleavers have shields", true).getBoolean(true); isHatchetWeapon = config.get("Battlegear", "Are Hatches also weapons", true).getBoolean(true); - + /* Save the configuration file */ config.save(); @@ -384,7 +384,8 @@ public class PHConstruct Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); - TConstruct.logger.severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); + TConstruct.logger + .severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); } } @@ -401,7 +402,7 @@ public class PHConstruct public static int searedTable; public static int castingChannel; public static int airTank; - + public static int craftedSoil; public static int oreSlag; public static int oreGravel; @@ -473,7 +474,7 @@ public class PHConstruct public static int slimeTallGrass; public static int slimeLeaves; public static int slimeSapling; - + public static int slimeChannel; public static int slimePad; @@ -701,12 +702,12 @@ public class PHConstruct public static boolean slimeIslGenDim0Only; public static int[] cfgDimBlackList; public static boolean slimeIslGenDim0; + public static boolean genIslandsFlat; //Experimental functionality public static boolean throwableSmeltery; - - + //Addon stuff public static boolean isCleaverTwoHanded; - public static boolean isHatchetWeapon; + public static boolean isHatchetWeapon; } diff --git a/src/tconstruct/worldgen/SlimeIslandGen.java b/src/tconstruct/worldgen/SlimeIslandGen.java index 8727535c..730bbd92 100644 --- a/src/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/tconstruct/worldgen/SlimeIslandGen.java @@ -35,7 +35,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator @Override public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) //IWorldGenerator version { - if (chunkGenerator instanceof ChunkProviderFlat || world.provider.terrainType == WorldType.FLAT) { + //dim 0 only? + if ((chunkGenerator instanceof ChunkProviderFlat || world.provider.terrainType == WorldType.FLAT) && PHConstruct.genIslandsFlat) { return; } From 3605bcb59c4cbb06745e13bb6038507acd5fec02 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 29 Oct 2013 18:24:42 -0400 Subject: [PATCH 08/23] fix merge derp --- src/tconstruct/util/config/PHConstruct.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 52150566..617c5c3c 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -365,10 +365,8 @@ public class PHConstruct cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}).getIntList(); slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false).getBoolean(false); slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); -<<<<<<< HEAD genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false).getBoolean(false); -======= ->>>>>>> a60fabcd9234f22a17190deceeece12190b00c72 + //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); From 42c3f87f82166e4e19b3aa6e28c4d896097dc48c Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 29 Oct 2013 19:30:44 -0400 Subject: [PATCH 09/23] load after ThermalExpansion if present to avoid issues w/ molten ender, and after Slime Knights library mod Mantle if present. --- src/tconstruct/TConstruct.java | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index 179008e0..555696ea 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; * @author mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.0d", dependencies = "required-after:Forge@[8.9,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.0d", dependencies = "required-after:Forge@[8.9,);after:Mantle-Core;after:Mantle-Router;after:ThermalExpansion") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -56,24 +56,12 @@ public class TConstruct if (Loader.isModLoaded("Natura")) { TConstruct.logger.info("[TConstruct] Natura, what are we going to do tomorrow night?"); - if (Loader.isModLoaded("ChaoticBastion")) - { - TConstruct.logger.info("[Natura] TConstruct, we're going to..."); - TConstruct.logger.info("[ChaoticBastion] All your base are belong to us!"); - - } - else - TConstruct.logger.info("[Natura] TConstruct, we're going to take over the world!"); + TConstruct.logger.info("[Natura] TConstruct, we're going to take over the world!"); } else { - if (Loader.isModLoaded("ChaoticBastion")) - { - TConstruct.logger.info("[TConstruct] Preparing to..."); - TConstruct.logger.info("[ChaoticBastion] I'MA FIRING MY LAZOR!"); - } - else - TConstruct.logger.info("[TConstruct] Preparing to take over the world"); + + TConstruct.logger.info("[TConstruct] Preparing to take over the world"); } EnvironmentChecks.verifyEnvironmentSanity(); @@ -156,7 +144,7 @@ public class TConstruct @EventHandler public void postInit (FMLPostInitializationEvent evt) { - proxy.postInit(); + proxy.postInit(); Behavior.registerBuiltInBehaviors(); SpecialStackHandler.registerBuiltInStackHandlers(); content.modIntegration(); From bf3b78e6462798809e38e279911ae124a734fc61 Mon Sep 17 00:00:00 2001 From: samtrion Date: Wed, 30 Oct 2013 03:43:45 +0100 Subject: [PATCH 10/23] cleanup chisel recipes --- src/tconstruct/common/TContent.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index b1eeed63..56423e86 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1251,6 +1251,7 @@ public class TContent implements IFuelHandler //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 0), new FluidStack(moltenIronFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //Iron tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 1), new FluidStack(moltenGoldFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //gold tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 2), new FluidStack(moltenCopperFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //copper @@ -1472,20 +1473,11 @@ public class TContent implements IFuelHandler chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel); chiseling.addDetailing(materials, 18, multiBrick, 13, chisel); - chiseling.addDetailing(multiBrick, 0, multiBrickFancy, 0, chisel); - chiseling.addDetailing(multiBrick, 1, multiBrickFancy, 1, chisel); - chiseling.addDetailing(multiBrick, 2, multiBrickFancy, 2, chisel); - chiseling.addDetailing(multiBrick, 3, multiBrickFancy, 3, chisel); - chiseling.addDetailing(multiBrick, 4, multiBrickFancy, 4, chisel); - chiseling.addDetailing(multiBrick, 5, multiBrickFancy, 5, chisel); - chiseling.addDetailing(multiBrick, 6, multiBrickFancy, 6, chisel); - chiseling.addDetailing(multiBrick, 7, multiBrickFancy, 7, chisel); - chiseling.addDetailing(multiBrick, 8, multiBrickFancy, 8, chisel); - chiseling.addDetailing(multiBrick, 9, multiBrickFancy, 9, chisel); - chiseling.addDetailing(multiBrick, 10, multiBrickFancy, 10, chisel); - chiseling.addDetailing(multiBrick, 11, multiBrickFancy, 11, chisel); - chiseling.addDetailing(multiBrick, 12, multiBrickFancy, 12, chisel); - chiseling.addDetailing(multiBrick, 13, multiBrickFancy, 13, chisel); + // adding multiBrick / multiBrickFanxy meta 0-13 to list + for (int sc = 0; sc < 14; sc++) + { + chiseling.addDetailing(multiBrick, sc, multiBrickFancy, sc, chisel); + } chiseling.addDetailing(Block.stoneBrick, 0, multiBrickFancy, 15, chisel); chiseling.addDetailing(multiBrickFancy, 15, multiBrickFancy, 14, chisel); From 791f019ec34201f20b006437a340a7d72edd1bed Mon Sep 17 00:00:00 2001 From: samtrion Date: Wed, 30 Oct 2013 04:08:12 +0100 Subject: [PATCH 11/23] cleanup fluid casting recipes --- src/tconstruct/common/TContent.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 56423e86..ca015eb8 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1251,23 +1251,13 @@ public class TContent implements IFuelHandler //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); + Fluid[] fluids = new Fluid[] { moltenIronFluid, moltenGoldFluid, moltenCopperFluid, moltenTinFluid, moltenAluminumFluid, moltenCobaltFluid, moltenArditeFluid, moltenBronzeFluid, + moltenAlubrassFluid, moltenManyullynFluid, moltenAlumiteFluid, moltenObsidianFluid, moltenSteelFluid, moltenGlassFluid, moltenStoneFluid, moltenEmeraldFluid }; - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 0), new FluidStack(moltenIronFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //Iron - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 1), new FluidStack(moltenGoldFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //gold - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 2), new FluidStack(moltenCopperFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //copper - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 3), new FluidStack(moltenTinFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //tin - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 4), new FluidStack(moltenAluminumFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //aluminum - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 5), new FluidStack(moltenCobaltFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //cobalt - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 6), new FluidStack(moltenArditeFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //ardite - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 7), new FluidStack(moltenBronzeFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //bronze - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 8), new FluidStack(moltenAlubrassFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //alubrass - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 9), new FluidStack(moltenManyullynFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //manyullyn - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 10), new FluidStack(moltenAlumiteFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //alumite - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 11), new FluidStack(moltenObsidianFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10);// obsidian - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 12), new FluidStack(moltenSteelFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //steel - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 13), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //glass - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 14), new FluidStack(moltenStoneFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //seared stone - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 15), new FluidStack(moltenEmeraldFluid, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); //emerald + for (int sc = 0; sc < 16; sc++) + { + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + } tableCasting.addCastingRecipe(new ItemStack(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); From 58bbea8b86c2e6ab8a8648f6e72a87a9a2235b18 Mon Sep 17 00:00:00 2001 From: samtrion Date: Wed, 30 Oct 2013 04:16:54 +0100 Subject: [PATCH 12/23] cleanup lavatank recipes + oreDictionary "glass" --- src/tconstruct/common/TContent.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index ca015eb8..33cb3a75 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1657,13 +1657,9 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', Block.glass); //Tank - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', Block.glass); //Glass - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', Block.glass); //Window - - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', clearGlass); //Tank - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', clearGlass); //Glass - GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', clearGlass); //Window + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', "glass")); //Tank + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //Window GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet @@ -1922,6 +1918,7 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall)); OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0)); OreDictionary.registerOre("glass", new ItemStack(clearGlass)); + OreDictionary.registerOre("glass", new ItemStack(Block.glass)); RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream)); RecipeRemover.removeShapedRecipe(new ItemStack(Item.leash)); From 2643fd4a8e1a84ed0632bb05446ecf51f01cf344 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 30 Oct 2013 13:22:00 -0400 Subject: [PATCH 13/23] use TE's ender fluid block if installed --- src/tconstruct/common/TContent.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index b1eeed63..4e136403 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -693,8 +693,15 @@ public class TContent implements IFuelHandler moltenEnderFluid = new Fluid("ender"); if (!FluidRegistry.registerFluid(moltenEnderFluid)) moltenEnderFluid = FluidRegistry.getFluid("ender"); - moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender"); - GameRegistry.registerBlock(moltenEnder, "liquid.ender"); + if (GameRegistry.findBlock("ThermalExpansion", "liquid.ender") == null) + { + moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender"); + GameRegistry.registerBlock(moltenEnder, "liquid.ender"); + } + else + { + moltenEnder = GameRegistry.findBlock("ThermalExpansion", "liquid.ender"); + } fluids[23] = moltenEnderFluid; fluidBlocks[23] = moltenEnder; moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); From 53c8a75cd163a33e4c6879abf71d4493da610a60 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 30 Oct 2013 13:29:30 -0400 Subject: [PATCH 14/23] move other ender fluid registrations to within the check for TE fluid --- src/tconstruct/common/TContent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 5d1c7d69..36995528 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -697,6 +697,8 @@ public class TContent implements IFuelHandler { moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender"); GameRegistry.registerBlock(moltenEnder, "liquid.ender"); + moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); } else { @@ -704,8 +706,6 @@ public class TContent implements IFuelHandler } fluids[23] = moltenEnderFluid; fluidBlocks[23] = moltenEnder; - moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); //Slime slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); From 991d36aa105febad6c5a30dfb9c1842252bb30a6 Mon Sep 17 00:00:00 2001 From: samtrion Date: Wed, 30 Oct 2013 20:41:42 +0100 Subject: [PATCH 15/23] Typo fix en_US --- resources/assets/tinker/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index a8850b8f..e32c0f28 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -305,7 +305,7 @@ block.glass.pure.name=Clear Glass block.glass.soul.name=Soul Glass block.glass.soul.pure.name=Clear Soul Glass -block.glass.pure.pane.name=Clear Pane +block.glass.pure.pane.name=Clear Glass Pane block.glass.soul.pane.name=Soul Pane block.glass.soul.pane.pure.name=Clear Soul Pane From d5507483c681c8dc16e06821e3c6ceb847779192 Mon Sep 17 00:00:00 2001 From: samtrion Date: Wed, 30 Oct 2013 21:24:31 +0100 Subject: [PATCH 16/23] cleanup fluid derp + missing recipes glass/fluid Line 344: Declared full fluid array --- src/tconstruct/common/TContent.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 36995528..4c9eb066 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1258,10 +1258,7 @@ public class TContent implements IFuelHandler //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); - Fluid[] fluids = new Fluid[] { moltenIronFluid, moltenGoldFluid, moltenCopperFluid, moltenTinFluid, moltenAluminumFluid, moltenCobaltFluid, moltenArditeFluid, moltenBronzeFluid, - moltenAlubrassFluid, moltenManyullynFluid, moltenAlumiteFluid, moltenObsidianFluid, moltenSteelFluid, moltenGlassFluid, moltenStoneFluid, moltenEmeraldFluid }; - - for (int sc = 0; sc < 16; sc++) + for (int sc = 0; sc < 25; sc++) { tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); } @@ -1358,14 +1355,18 @@ public class TContent implements IFuelHandler Smeltery.addMelting(new ItemStack(Item.enderPearl, 4), metalBlock.blockID, 10, 500, new FluidStack(moltenEnderFluid, 250)); Smeltery.addMelting(new ItemStack(metalBlock, 1, 10), metalBlock.blockID, 10, 500, new FluidStack(moltenEnderFluid, 1000)); + Smeltery.addMelting(new ItemStack(Item.snowball, 1, 0), 75, new FluidStack(FluidRegistry.getFluid("water"), 125)); //Blocks Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(Block.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); + Smeltery.addMelting(Block.blockSnow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); + Smeltery.addMelting(Block.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); @@ -1655,8 +1656,9 @@ public class TContent implements IFuelHandler //Glass GameRegistry.addRecipe(new ItemStack(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', clearGlass }); - GameRegistry.addRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', Block.glass, 'Q', Item.netherQuartz, 'W', Block.woodSingleSlab }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Item.netherQuartz, 'W', "slabWood" })); GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', clearGlass, 'S', Item.netherStar, 'O', Block.obsidian }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(glassPane, 16, 0), "GGG", "GGG", 'G', clearGlass)); //Smeltery ItemStack searedBrick = new ItemStack(materials, 1, 2); From 6028ea74cbc20a99e04249e64c3938509a4c59d2 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Wed, 30 Oct 2013 22:15:03 +0000 Subject: [PATCH 17/23] Add Optifine to unsupported mod checks. Also moves the GT log note to Env Checks. --- src/tconstruct/util/EnvironmentChecks.java | 22 +++++++++++++-------- src/tconstruct/util/config/PHConstruct.java | 2 -- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index a0c2fc5c..2ea6e4c0 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -1,8 +1,11 @@ package tconstruct.util; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import tconstruct.TConstruct; import java.util.ArrayList; import java.util.List; @@ -15,21 +18,24 @@ public class EnvironmentChecks { * Checks for conflicting stuff in environment; adds callable to any crash logs if so. */ public static void verifyEnvironmentSanity() { - boolean supportedEnv = true; + List modIds = new ArrayList(); if (Loader.isModLoaded("gregtech_addon")) { - List modIds = new ArrayList(); + TConstruct.logger.severe("[Environment Checks] Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); modIds.add("gregtech_addon"); - - ICrashCallable callable = new CallableUnsuppConfig(modIds); - FMLCommonHandler.instance().registerCrashCallable(callable); - - supportedEnv = false; } - if (supportedEnv) { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT && FMLClientHandler.instance().hasOptifine()) { + TConstruct.logger.severe("[Environment Checks] Optifine detected. This is a Bad Thing(tm) and can crash Minecraft due to an Optifine bug during TCon armor renders!"); + modIds.add("optifine"); + } + + if (modIds.size() == 0) { ICrashCallable callable = new CallableSuppConfig(); FMLCommonHandler.instance().registerCrashCallable(callable); + } else { + ICrashCallable callable = new CallableUnsuppConfig(modIds); + FMLCommonHandler.instance().registerCrashCallable(callable); } } diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 617c5c3c..29bbb22a 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -385,8 +385,6 @@ public class PHConstruct Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); - TConstruct.logger - .severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); } } From 6b8a5bf0bacb5083926338d4004810577f99d2f2 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 30 Oct 2013 18:20:44 -0400 Subject: [PATCH 18/23] add in comments to config regarding slime island settings --- src/tconstruct/util/config/PHConstruct.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 617c5c3c..a3bf7a8a 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -362,11 +362,10 @@ public class PHConstruct connectedTexturesMode = conTexMode.getInt(2); //dimension blacklist - cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}).getIntList(); - slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false).getBoolean(false); - slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); - genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false).getBoolean(false); - + cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {},"Add dimension ID's to prevent slime islands from generating in them").getIntList(); + slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false,"True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false); + slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true,"True: slime islands generate in overworld; False they do not generate").getBoolean(true); + genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds").getBoolean(false); //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); From 7f5fe93a6591baf75dcf8168f1b1c6fd1b2657b5 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 30 Oct 2013 21:10:09 -0400 Subject: [PATCH 19/23] more TE compat fixes --- resources/assets/tinker/lang/de_DE.lang | 2 +- resources/assets/tinker/lang/en_US.lang | 2 +- resources/assets/tinker/lang/it_IT.lang | 2 +- resources/assets/tinker/lang/ru_RU.lang | 2 +- src/tconstruct/common/TContent.java | 20 ++++++++++++-------- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/resources/assets/tinker/lang/de_DE.lang b/resources/assets/tinker/lang/de_DE.lang index 46d73e0f..30a80861 100644 --- a/resources/assets/tinker/lang/de_DE.lang +++ b/resources/assets/tinker/lang/de_DE.lang @@ -437,7 +437,7 @@ tile.metal.molten.lead.name=Geschmolzenes Blei tile.metal.molten.shiny.name=Geschmolzenes Platin tile.metal.molten.invar.name=Geschmolzenes Invar tile.metal.molten.Electrum.name=Geschmolzenes Elektrum -tile.liquid.ender.name=Verflüssigtes Ender +tile.fluid.ender.name=Verflüssigtes Ender LiquidMetal.Iron.name=Geschmolzenes Eisen LiquidMetal.Gold.name=Geschmolzenes Gold diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index e32c0f28..1646d2ee 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -437,7 +437,7 @@ tile.metal.molten.lead.name=Molten Lead tile.metal.molten.shiny.name=Molten Shiny tile.metal.molten.invar.name=Molten Invar tile.metal.molten.Electrum.name=Molten Electrum -tile.liquid.ender.name=Liquified Ender +tile.fluid.ender.name=Liquified Ender LiquidMetal.Iron.name=Molten Iron LiquidMetal.Gold.name=Molten Gold diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 7b654763..2ad60095 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -437,7 +437,7 @@ tile.metal.molten.lead.name=Piombo Fuso tile.metal.molten.shiny.name=Platino Fuso tile.metal.molten.invar.name=Invaro Fuso tile.metal.molten.Electrum.name=Elettro Fuso -tile.liquid.ender.name=Ender Liquefatto +tile.fluid.ender.name=Ender Liquefatto LiquidMetal.Iron.name=Ferro Fuso LiquidMetal.Gold.name=Oro Fuso diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index a5db788c..9503b4dd 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -335,7 +335,7 @@ tile.metal.molten.lead.name=Расплавленный свинец tile.metal.molten.shiny.name=Расплавленный блеск tile.metal.molten.invar.name=Расплавленный инвар tile.metal.molten.Electrum.name=Расплавленный электрум -tile.liquid.ender.name=Сжиженный эндер +tile.fluid.ender.name=Сжиженный эндер item.food.apple.diamond.name=Драгоценное яблоко item.tconstruct.strangefood.edibleslime.name=Желатиновая слизь diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 4c9eb066..4f4cfc6d 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -691,18 +691,22 @@ public class TContent implements IFuelHandler FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1000), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); moltenEnderFluid = new Fluid("ender"); - if (!FluidRegistry.registerFluid(moltenEnderFluid)) - moltenEnderFluid = FluidRegistry.getFluid("ender"); - if (GameRegistry.findBlock("ThermalExpansion", "liquid.ender") == null) + if (GameRegistry.findBlock("ThermalExpansion", "fluid.ender") == null ) { - moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender"); - GameRegistry.registerBlock(moltenEnder, "liquid.ender"); - moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); + moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("fluid.ender"); + if (FluidRegistry.registerFluid(moltenEnderFluid)) + { + //TConstruct.logger.info("Registering Molten Ender Stuff."); + GameRegistry.registerBlock(moltenEnder, "fluid.ender"); + moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); + } } else { - moltenEnder = GameRegistry.findBlock("ThermalExpansion", "liquid.ender"); + + moltenEnderFluid = FluidRegistry.getFluid("ender"); + moltenEnder = GameRegistry.findBlock("ThermalExpansion", "fluid.ender"); } fluids[23] = moltenEnderFluid; fluidBlocks[23] = moltenEnder; From 967e7210d660ab976bc6b3ef48c713df94926353 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Thu, 31 Oct 2013 19:52:11 +0000 Subject: [PATCH 20/23] Amend environment checks --- src/tconstruct/util/EnvironmentChecks.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index 2ea6e4c0..ff9ff047 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -22,6 +22,10 @@ public class EnvironmentChecks { if (Loader.isModLoaded("gregtech_addon")) { TConstruct.logger.severe("[Environment Checks] Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); + TConstruct.logger.severe("[Environment Checks] A NOTE TO THE USER: Gregtech has been known to crash the game with Metallurgy and for certain specific 'banished' players."); + TConstruct.logger.severe("[Environment Checks] For this reason, the TCon dev team urge you to seek your tedium fix from someone else, as Greg disobeys"); + TConstruct.logger.severe("[Environment Checks] the basic tenets of good modders conduct. We log this message rather than sabotage. We'd hope he'd do the same."); + TConstruct.logger.severe("[Environment Checks] In the meantime, we recommend not playing anything but IC2 alongside Gregtech. ~ Sunstrike"); modIds.add("gregtech_addon"); } From 84bacd6bbb90a519dec4bd0d0d8f53101488cc7a Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Thu, 31 Oct 2013 20:18:02 -0400 Subject: [PATCH 21/23] NPE fixes --- src/tconstruct/client/RenderItemCopy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tconstruct/client/RenderItemCopy.java b/src/tconstruct/client/RenderItemCopy.java index a62e24fc..a0c8b58d 100644 --- a/src/tconstruct/client/RenderItemCopy.java +++ b/src/tconstruct/client/RenderItemCopy.java @@ -349,14 +349,14 @@ public class RenderItemCopy extends Render { int k = par3ItemStack.itemID; int l = par3ItemStack.getItemDamage(); - Object object = par3ItemStack.getItem() == null ? null : par3ItemStack.getIconIndex() ; + Object object = par3ItemStack.getItem() == null ? null : par3ItemStack.getIconIndex(); float f; int i1; float f1; float f2; - + Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) + if (block != null && par3ItemStack.getItemSpriteNumber() == 0 && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); @@ -382,7 +382,7 @@ public class RenderItemCopy extends Render this.itemRenderBlocks.useInventoryTint = true; GL11.glPopMatrix(); } - else if (Item.itemsList[k].requiresMultipleRenderPasses()) + else if (Item.itemsList[k] != null && Item.itemsList[k].requiresMultipleRenderPasses()) { GL11.glDisable(GL11.GL_LIGHTING); From 2ff64ede5ac0bc872f2a237de04e08af6f7b98ab Mon Sep 17 00:00:00 2001 From: Glassmaker Date: Fri, 1 Nov 2013 15:38:34 +0300 Subject: [PATCH 22/23] Added AE api to clean up --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 1b7b2452..c1ae91a4 100644 --- a/build.xml +++ b/build.xml @@ -273,6 +273,7 @@ + From 2c2107baf837e6d08b87632cb40ec3587505e580 Mon Sep 17 00:00:00 2001 From: Glassmaker Date: Fri, 1 Nov 2013 15:48:20 +0300 Subject: [PATCH 23/23] Adjusted removal of WAILA API, as it leaves an empty folder --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c1ae91a4..db7f9ba0 100644 --- a/build.xml +++ b/build.xml @@ -272,7 +272,7 @@ - +