Commit graph

631 commits

Author SHA1 Message Date
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
ed220f19d6 Merge pull request #207 from Zixxl/master
Fixed error from last pull request
2015-07-27 09:00:59 +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
12238d395a Merge pull request #206 from Zixxl/master
Commits for v0.9.2
2015-07-27 08:39:55 +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
6fbca2547f Merge pull request #198 from Zixxl/master
Last bugfixes for 0.9.1
2015-07-20 09:10:55 +02:00
Zixxl
fc719292b8 Version update to 0.9.1 2015-07-20 09:07:53 +02:00
Zixxl
a2a57a2be5 Merge remote-tracking branch 'upstream/master' 2015-07-20 09:05:08 +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
825658669b Merge pull request #190 from Zixxl/master
More Mekanism handlers
2015-07-16 12:34:07 +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
9776048015 Merge pull request #189 from Voidi/master
fix #188: change in getRecipeInfo from getPlan() to getRecipeOutput()
2015-07-15 22:46:54 +02:00
Tobias Wohlfarth
79021f05e5 fix #188: change in getRecipeInfo from getPlan() to getRecipeOutput() 2015-07-15 22:41:26 +02:00
Zixxl
5cdda63038 Merge pull request #187 from Voidi/master
Updated mods.forestry.Centrifuge for newest Version of Forestry API
2015-07-15 18:49:06 +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
b07c660ef4 Merge pull request #185 from Zixxl/master
Botania PureDaisy & Brew support
2015-07-15 10:34:14 +02:00
Zixxl
aa6ad5dadc Finished Botania pure daisy & brew support 2015-07-15 10:32:32 +02:00
Zixxl
f65485cd60 We should track mod compatibility 2015-07-15 10:25:07 +02:00
Zixxl
0c581dc787 Adding Botania brew & pure daisy support
- Issue: jaredlll08/ModTweaker2#177
2015-07-14 17:34:44 +02:00
Zixxl
922e17384c Merge pull request #184 from Zixxl/master
Factorization support 0.8.95+
2015-07-14 15:31:39 +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
Jared
e467dcff94 Merge pull request #181 from Zixxl/master
Little rework
2015-07-13 22:12:51 +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