Commit graph

140 commits

Author SHA1 Message Date
Yulife 6fd85cbd10 Return of Hidden Research and Item in Entries
These changes were taken from the old repo. I have no idea if those
actually work yet if the mod even builds with them :)
**Changes:**
-Botania Lexicon Entries now take an ItemStack to display the ItemStack
on the side when looking into the Lexica
-Hidden Research with triggers for Items, Entitities and Aspects
2015-08-01 12:55:03 +02:00
Tobias Wohlfarth 3316f0b90d Merge branch 'forestry_rework' 2015-07-28 21:48:05 +02:00
Tobias Wohlfarth 371658c9b3 fix: remove (for now) Stacksize comparison
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java
2015-07-28 21:40:01 +02:00
Tobias Wohlfarth 380ea8a2f9 add: Moistener fuel support
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java
2015-07-28 20:46:23 +02:00
Tobias Wohlfarth 27e4fffd07 add: Fermenter fuel support
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java
2015-07-28 20:41:56 +02:00
Tobias Wohlfarth c0df1733da imporved: Forestry Carpenter
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java
2015-07-28 20:39:21 +02:00
Zixxl a4b2d47f74 Removed unused import 2015-07-27 08:58:47 +02:00
Zixxl e9cdbfba92 Revert "Removed unused import"
This reverts commit 6cbc1ff102.
2015-07-27 08:56:20 +02:00
Zixxl 6cbc1ff102 Removed unused import 2015-07-27 08:53:33 +02:00
Zixxl acf41557a8 Bugfix for AE Inscriber
- Fixed addRecipe for AE Inscriber always throws error about missing
parameters
2015-07-22 09:51:11 +02:00
Zixxl ffe8821976 Make BlastFurnace fuels accessible 2015-07-20 12:11:13 +02:00
Zixxl 7567161204 Revert "Removed fuel handler"
This reverts commit e10f0e3431.
2015-07-20 11:59:15 +02:00
Zixxl e10f0e3431 Removed fuel handler
- Railcraft uses UnmodifiableList to store fuels
2015-07-20 11:56:16 +02:00
Zixxl 94a83aa35a Updated Chisel2 lib 2015-07-20 11:16:56 +02:00
Zixxl 99bd8eaa1e BracketHandler for thaumcraft aspects 2015-07-20 10:14:18 +02:00
Zixxl db9b0e3c11 Railcraft fuel handler 2015-07-20 10:11:58 +02:00
Zixxl fc719292b8 Version update to 0.9.1 2015-07-20 09:07:53 +02:00
Zixxl a5f84d26a7 Code cleanup 2015-07-20 09:03:48 +02:00
Zixxl eeba6a3390 Bugfixes
- Added missing annotation in Mekanism handler
- More detailed error logging in ReflectionHelper
2015-07-20 09:02:07 +02:00
Tobias Wohlfarth 7f42a0b2cc improved: Forestry Squeezer
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java
2015-07-20 00:13:30 +02:00
Zixxl 269abc5750 Removed old (invalid) code 2015-07-17 12:26:55 +02:00
Zixxl c9830912c8 Small bugfix 2015-07-16 12:32:07 +02:00
Zixxl 87c20f178a Fixes for description 2015-07-16 11:53:59 +02:00
Zixxl 231f25eec4 More Mekanism handler 2015-07-16 11:38:25 +02:00
Tobias Wohlfarth 79021f05e5 fix #188: change in getRecipeInfo from getPlan() to getRecipeOutput() 2015-07-15 22:41:26 +02:00
Tobias Wohlfarth a69971aca5 fix: Not everyone has Botania loaded
modified:   src/main/java/modtweaker2/helpers/StackHelper.java
2015-07-15 18:16:10 +02:00
Tobias Wohlfarth c6f31249f5 Merge branch 'master' into forestry_rework
Conflicts:
	src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java
2015-07-15 16:52:30 +02:00
Zixxl aa6ad5dadc Finished Botania pure daisy & brew support 2015-07-15 10:32:32 +02:00
Zixxl 0c581dc787 Adding Botania brew & pure daisy support
- Issue: jaredlll08/ModTweaker2#177
2015-07-14 17:34:44 +02:00
Zixxl 583c4f3687 Not everyone has Mekanism loaded 2015-07-14 15:26:32 +02:00
Zixxl dea2ab4337 Factorization support 0.8.95+ 2015-07-14 15:25:59 +02:00
Zixxl 9bbd26d7ac Added Insolator handler to registry 2015-07-13 21:58:48 +02:00
Zixxl 9a9f6ccaf2 Added Thermal Expansion Insolator support 2015-07-13 21:36:01 +02:00
Zixxl 3c7d6c120e Fixed Bug in ExNihilo recipe handlers 2015-07-13 21:11:01 +02:00
Zixxl 3d71e17b66 Mekanism v8 support 2015-07-13 17:34:06 +02:00
Zixxl 34a6c92939 Revert da33cc6fab for mekanism 2015-07-10 16:46:19 +02:00
Zixxl 7571f526d7 ExNihilo rework finished 2015-07-10 16:27:02 +02:00
Zixxl df846585c4 Started with ExNihilo rework 2015-07-09 16:57:05 +02:00
Zixxl 2dd8e910f4 More Logging rework 2015-07-09 11:28:40 +02:00
Zixxl ece7dca426 Some more TConstruct tweaks 2015-07-08 17:27:44 +02:00
Zixxl d153adc91b Bugfixing in TConstruct Smeltery 2015-07-08 15:03:58 +02:00
Zixxl 003a5dc92c Suppress some warnings 2015-07-08 13:57:26 +02:00
Zixxl 7317d30ca1 Should also updated to new version number 2015-07-08 13:56:42 +02:00
Zixxl eef4c19a47 Better error logging 2015-07-08 13:56:27 +02:00
Tobias Wohlfarth e2a402db43 fix: Forestry Centrifuge - ignore input stacksize, same behaviour as forestry internal works 2015-07-07 16:42:30 +02:00
Tobias Wohlfarth 23e362c5d2 fix: Centrifuge Recipe removal
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java
2015-07-07 16:42:30 +02:00
Tobias Wohlfarth 4126c64792 fix: modified mods.forestry.Centrifuge for newest Version of Forestry API
new file:   libs/forestry_1.7.10-3.6.1.18-dev.jar
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java
2015-07-07 16:42:30 +02:00
Zixxl 9f61304258 More Thermal Expansion rework
- Equals method
- refreshRecipes for all machines
2015-07-07 15:40:03 +02:00
Zixxl 615e96d27f Problem with lowercase on folder 2015-07-07 14:55:59 +02:00
Zixxl e48fcbe438 Moved AuraLogger to command package 2015-07-07 14:49:28 +02:00