Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
249 commits 6 branches 3 tags 472 MiB
Commit graph

249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yulife
28b835e733 Update Insolator.java 2015-08-16 16:47:39 +02:00
Yulife
4e7da8fa84 Update Insolator.java 2015-08-16 16:38:50 +02:00
Tobias Wohlfarth
7f1830c11a fix: removed IDEA IntelliJ project files from repo, improved .gitignore 2015-08-15 05:54:03 +02:00
Zixxl
588f06d647 Merge pull request #227 from Zixxl/master 
ExNihilo fix for heat source removal
 2015-08-13 10:34:12 +02:00
Zixxl
fd71e7253c Merge remote-tracking branch 'upstream/master' 2015-08-13 10:28:52 +02:00
Zixxl
8eb85f1022 ExNihilo fix 
- Heat sources can't be removed (Issue: jaredlll08/ModTweaker2#225 )
 2015-08-13 09:16:25 +02:00
Yulife
8c974ec7e9 It's Orechid. 2015-08-05 08:55:33 +02:00
Zixxl
126255e65b Merge pull request #217 from Zixxl/master 
Added missing import
 2015-08-03 17:47:24 +02:00
Zixxl
326156ecdb Added missing import 2015-08-03 17:45:39 +02:00
Zixxl
14c4af3985 Merge pull request #216 from Zixxl/master 
Bugfixes for Mekanism handlers
 2015-08-03 17:40:24 +02:00
Zixxl
e79a0fb1c4 Changed reference to correct recipe map 2015-08-03 17:37:05 +02:00
Zixxl
f559f476d4 Merge remote-tracking branch 'upstream/master' 2015-08-03 17:34:33 +02:00
Zixxl
91f47fc994 Added missing Annotation 2015-08-03 17:34:16 +02:00
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
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