Commit Graph

2045 Commits (master)

Author SHA1 Message Date
Arona Jones 326b1c7fab Merge branch 'pr/300'
Conflicts:
	src/main/java/steamcraft/api/item/UniversalWrench.java
2015-08-22 10:16:01 +01:00
SkySom e24eeb7595 ICrowbar readded to IUniversalWrench
Railcraft automatically downloads and is compiled in
2015-08-21 18:54:49 -04:00
Arona Jones 025da08a0e Attempt a Temporary workaround to hammers disappearing when crafted by cool people outside of a vanilla table. From one hack to another. 2015-08-21 22:21:38 +01:00
Arona Jones 5976778e42 As requested in #299, allow the grindstone to grind metals that aren't in Steamcraft via the oredict. Configurable. 2015-08-21 18:26:56 +01:00
Arona Jones 46f97a608a Further refining on tea plant drops 2015-08-21 17:39:40 +01:00
Arona Jones 4a84cede30 Load after thaumcraft. Fixes #297 2015-08-21 17:36:55 +01:00
Arona Jones 73fdf6f03a Fix metadata of tea leaves dropped from tea plants. Closes #298 2015-08-21 17:35:59 +01:00
Arona Jones ae67976ea0 Improve charger model/texture 2015-08-21 11:54:05 +01:00
Arona Jones 42531ac29b Register teacups as "foodTea" in oredict, for BetterSleeping compat 2015-08-21 10:58:35 +01:00
Arona Jones 8610da0b2d New/fisnished battery bank model 2015-08-16 13:38:35 +01:00
Arona Jones 5222177a2a Comply with reorg 2015-08-15 09:01:39 +01:00
Arona Jones c2ab014c31 Comply with BP baseclass reorg 2015-08-14 09:52:38 +01:00
Arona Jones b0b5d838b1 Put the tools back in the creative tab where they belong. 2015-08-13 21:56:02 +01:00
Arona Jones e972295fe3 Fix stonebrick wall naming 2015-08-13 21:53:31 +01:00
Arona Jones e62c592e7b Support the new Boilerplate base tool classes. Seperate out steam tools 2015-08-13 21:53:24 +01:00
Arona Jones 420a6dc0c8 Use BP's BaseArmor 2015-08-13 19:03:38 +01:00
Arona Jones f8d233ee38 Fixes 2015-08-13 12:13:25 +01:00
Arona Jones 56b9072a96 Turn stonebrick wall variants into metadata 2015-08-12 14:17:56 +01:00
Arona Jones 02fc0bbbef Work on hatch 2015-08-12 10:35:29 +01:00
Arona Jones 30375f8001 Revert metal ore name changes 2015-08-11 22:35:50 +01:00
Arona Jones 267a94672e Add brick wall 2015-08-11 22:34:37 +01:00
Arona Jones e9248adb8a Temp Steel pipe texture 2015-08-07 10:58:17 +01:00
Arona Jones c1268ed2fb Locally archived a lot of unused asset files 2015-08-05 11:40:49 +01:00
Arona Jones 66a053f831 Update forge version a bit 2015-07-27 00:24:35 +01:00
Arona Jones 9ffa7fe4dd Implemented methods called on addition/removal of modules from armor. 2015-07-22 22:39:24 +01:00
Arona Jones 6752de0f61 Don't cache boilerplate 2015-07-22 21:36:50 +01:00
Decebaldecebal eb4bbac667 Properly register empty tile entities.Fixes #295 2015-07-20 15:25:41 +03:00
Decebaldecebal 2e8cc6a714 Only update intake tile on server side, should fix #296 2015-07-20 15:23:21 +03:00
Arona Jones 22971108b0 Force latest again 2015-07-10 09:05:36 +01:00
Arona Jones 03d1edbe91 Fix #292: Broken teacup recipe. 2015-07-10 08:57:19 +01:00
Arona Jones c251d798f4 Move BaseContainerGui to boilerplate 2015-07-10 08:54:42 +01:00
Decebaldecebal cb34e8b70e Switched Obsidian Armor slowness to not use potion effects.Fix #239
Fire resistance can't be easily coded without potions...
2015-07-09 13:52:27 +03:00
Decebaldecebal bb66a71f36 Proper recipe for TeaCup that gives a full teacup.Nerfed the bufs from tea.
Oh boy, the speed buf was OP...
2015-07-09 13:31:32 +03:00
Decebaldecebal baf84f1d15 Update Electric Jars transfer rates.(swap them since I updated BoilerPlate) 2015-07-09 13:26:23 +03:00
Decebaldecebal 66fcf38de7 Decreased Ray Gun energy usage and actually stop guns from working if they do
not have enough energy.Also increased energy storage of Ray Gun.
2015-07-08 15:06:13 +03:00
Decebaldecebal b9c7fba52c Fix Ray Gun and Shrink Ray.Never use extractEnergy on items that shouldn't
provide energy to other items.
Also tweaked some energy storage and transfer rates.
2015-07-08 15:00:21 +03:00
Decebaldecebal df99b2f413 Make Spanner Work with Steel Pipes. 2015-07-08 14:11:20 +03:00
Decebaldecebal b80378570c Work on Steel Pipes. 2015-07-08 14:09:06 +03:00
Decebaldecebal e0d798f900 Removed redundant class BaseDrill.
Also gave all drills an attack damage of 1 so attributes display properly.
(every item in the game has a 1 attack speed)
2015-07-07 15:46:25 +03:00
Decebaldecebal bb58ca4240 Electric Jars can now charge items in the player inventory by shift-right clicking them.
Works similar to Thermal Expansion's Capacitors.Closes #289.
2015-07-07 15:40:05 +03:00
Decebaldecebal 2146ee9730 Fixed Spalsh Lightning Bottle.Fixes #290
Now it works like a splash potion, I couldn't get the charging method to work properly...
2015-07-07 15:00:59 +03:00
Decebaldecebal d04e17b78b Fixed Statis Field not keeping items from despawning.Closes #291 2015-07-07 14:28:06 +03:00
Arona Jones 12455243c1 Remove botania wiki stuff 2015-07-05 15:22:38 +01:00
Arona Jones fc7ee5a20a Oops 2015-07-05 15:15:32 +01:00
Arona Jones 9366f65ab4 Require BP6.0.0 2015-07-05 15:08:16 +01:00
Arona Jones e51c15fcf2 Version & changelog updates for new release 2015-07-05 11:55:06 +01:00
Arona Jones a0ae2a551a Comment out the handbook autopop for now 2015-07-05 11:55:06 +01:00
Arona Jones 59c1cf1b54 Merge pull request #288 from Chocohead/patch-1
Fixed catastrophic mistakes
2015-07-05 11:34:31 +01:00
Chocohead f2950751a7 Fixed catastrophic mistakes
How could you ever claim Aluminum is spelt right?
2015-06-30 23:50:51 +01:00
Decebaldecebal 54a520aed5 Slighty increased copper tank bounding box as well.
I am very nit picky :)
And between exams!
2015-06-29 22:58:10 +03:00