Commit Graph
2423 Commits
Author SHA1 Message Date
samtrion e4583c5e7e Adding/Removing Recipes
Removing recipe duplicates (Double or oreDictionary version available)
Adding missing recipes for craftingSlabwood
2013-10-29 20:04:11 +01:00
samtrion 9659a1d3ba Removing config duplications 2013-10-29 17:44:24 +01:00
Sunstrike fe76c424bf Delete aksnc
What even -was- that?
2013-10-28 22:39:30 +00:00
mDiyo 223d32cee7 Merge pull request #285 from Samtrion/master
Fix: Server Issue with NEI
2013-10-28 14:44:56 -07:00
samtrion 68202792b6 Fix: Server Issue with NEI 2013-10-28 22:41:46 +01:00
mDiyo 6368cd477b Eclipse formatter for project cleanliness 2013-10-28 13:07:35 -07:00
Zach f28c169d43 get rid of extra space in NBT messages to mystcraft 2013-10-28 15:47:46 -04:00
mDiyo 02b460c87a Merge pull request #252 from brunoss/master
Typo fixed
2013-10-28 12:43:47 -07:00
mDiyo 8dfeb8edb6 Merge pull request #265 from alexbegt/master
Cleaning up villages
2013-10-28 12:43:15 -07:00
mDiyo a3a6e72db6 Merge pull request #282 from Samtrion/master
Add ShapedOreRecipe for Lead/Leash
2013-10-28 12:42:56 -07:00
mDiyo 7cf04a39cb Merge pull request #284 from Samtrion/master
Adding Furnace Recipes for Berry Bushes and Fuel Handler for Wooden Pattern
2013-10-28 12:42:12 -07:00
samtrion 5595fe0092 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-10-28 20:32:38 +01:00
samtrion 01ce4b953b Adding Smelting Recipe/Fuel
Adding Bushes as Furnace Recipe
Adding Wood Patterns as fuel
2013-10-28 20:31:18 +01:00
Sunstrike 816c86e4d5 Merge pull request #283 from TheVikingWarrior/patch-3
Update it_IT.lang
2013-10-28 12:24:55 -07:00
Sunstrike feb3c55393 Partially plug lava leak in Smeltery.
Seared Tanks - A bit leaky, no? Just kidding - It was the logic in SmelteryComponent leaking.
2013-10-28 19:20:42 +00:00
TheVikingWarrior 5c1b9be2df Update it_IT.lang 2013-10-28 20:01:37 +01:00
Sunstrike 807c91d317 Fix wooden rail localisation + add recipe 2013-10-28 18:50:01 +00:00
Sunstrike 86f436a2c8 Fix NEI URL in build.xml 2013-10-28 17:38:25 +00:00
Sunstrike f64d461ff0 Fucking build file...
Atleast check your Ant stuff is valid for the love of the build server...
2013-10-28 17:27:08 +00:00
Sunstrike 74c3752ba7 Fix build file.
NEI integration?! Why the hell is that even here?! Also, TEST the ant file before committing new changes to it
2013-10-28 17:18:08 +00:00
samtrion 7f07ce616e Add ShapedOreRecipe for Lead/Leash 2013-10-28 17:57:32 +01:00
Sunstrike e671efc362 Merge pull request #281 from TheVikingWarrior/patch-3
Update it_IT.lang
2013-10-28 08:09:51 -07:00
TheVikingWarrior 2f5f517bf7 Update it_IT.lang 2013-10-28 13:51:47 +01:00
TheVikingWarrior 561cc4e0c9 Update it_IT.lang 2013-10-28 13:49:35 +01:00
Arthur Uzulin 2fcc67e876 Custom firework rocket for landmines (WIP)
- Made the firework rocket impossible to dismount
- Made the firework rocket inflict a large amount of damage to the
player upon explosion
- Moved DamageSourceLandmine to it's appropriate place
- Fixed the landmine death localization *blames Sunstrike*
2013-10-28 23:12:41 +11:00
Zach ae4dbb8095 Merge pull request #279 from alexbegt/patch-1
Correcting names.
2013-10-27 06:40:09 -07:00
Alexander Behrhof 9e4c58bcbe Correcting names. 2013-10-27 09:09:03 -04:00
Arthur Uzulin b44469827a Crafting station NEI support
Thanks to CB for the help.
{I am hoping this does not nuke the build server}
2013-10-27 17:17:34 +11:00
Progwml6 65ff510b3c move AE imc messages to TCon from a plugin 2013-10-26 19:18:44 -04:00
Progwml6 c479d16e7e add seared blocks to FMP 2013-10-26 16:01:14 -04:00
Progwml6 d6372196fe IMC should not be in plugins.
moved BC imc to main mod, and added load checks before sending IMC messages during init
2013-10-26 15:50:47 -04:00
Progwml6 74b6b8f1d4 Revert "BuildCraft Compat - Adds ~60 Facades"
This reverts commit 18cb3ac22e.
2013-10-26 15:06:09 -04:00
Sunstrike e52da9b27c Merge pull request #278 from Samtrion/master
BuildCraft Compat + mcmod.info update
2013-10-26 09:55:46 -07:00
samtrion b09bea5942 Updated mcmod.info
Fixed compat FMP
Added Compat AE
Added Compat Waila
Added Compat BC
2013-10-26 18:46:52 +02:00
samtrion 18cb3ac22e BuildCraft Compat - Adds ~60 Facades
Adds the TiC Blocks as BC Facade
2013-10-26 18:45:11 +02:00
Sunstrike 50f115e42c Merge pull request #277 from TheVikingWarrior/patch-3
Update it_IT.lang
2013-10-26 07:41:46 -07:00
TheVikingWarrior 0bbb277128 Update it_IT.lang 2013-10-26 16:38:29 +02:00
Sunstrike a4568dccd2 Merge pull request #276 from Vexatos/patch-2
Update de_DE.lang
2013-10-26 06:41:55 -07:00
Vexatos 76850e82f5 Update de_DE.lang 2013-10-26 15:28:39 +02:00
Sunstrike 1c79f117e2 Merge pull request #273 from iguanaman/master
Make getHarvestLevelName protected for overriding.
2013-10-26 02:22:09 -07:00
iguanaman 451a67aab7 Update ToolStationGui.java
Changed getHarvestLevelName from private to protected
2013-10-26 15:55:53 +09:00
Zach 51bbaf4d42 Delete IBeeComparison.java
class not needed -- will fail builds if in repo
2013-10-25 20:34:31 -04:00
mDiyo e5c9642b0d Update AE api 2013-10-25 17:06:14 -07:00
Arthur Uzulin 434f67f42a Functioning advanced drawbridges
(May need a better recipe, also, may not)
2013-10-26 10:47:11 +11:00
Arthur Uzulin 828acc41b1 Fixed advanced drawbridge dupe bug 2013-10-26 10:25:41 +11:00
Sunstrike daec0eacfa Pull in wooden rails from Chaotic Bastion. 2013-10-24 18:59:04 +01:00
Sunstrike d80b0c7c31 Cleanup aftermath of previous drunkcode session in AE plugin. 2013-10-24 16:16:31 +01:00
Sunstrike 579764c621 Add TConstruct Environment to valid crash reports as well 2013-10-24 12:27:50 +01:00
Zach 56802109c1 Merge pull request #269 from Zerokyuuni/master
Hurp all the durps
2013-10-23 13:50:25 -07:00
Zerokyuuni 9c38d4630c Hurp all the durps 2013-10-23 16:46:35 -04:00