Commit graph

249 commits

Author SHA1 Message Date
Yulife
8c974ec7e9 It's Orechid. 2015-08-05 08:55:33 +02:00
Zixxl
326156ecdb Added missing import 2015-08-03 17:45:39 +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
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
Zixxl
47be63311c Factorization rework 2015-07-07 14:17:47 +02:00
Zixxl
39e415b36d Code cleanup 2015-07-07 12:00:17 +02:00
Zixxl
3990a81390 Duplicate & input check for PneumaticCraft 2015-07-06 18:11:37 +02:00
Zixxl
6bf0797054 Changes in ReflectionHelper 2015-07-06 17:42:39 +02:00
Zixxl
1239575736 Fixed constructor argument for Pulverizer 2015-07-06 16:17:36 +02:00
Zixxl
22e09c9392 Thermal Expansion Rework 2015-07-06 15:29:24 +02:00
Zixxl
40605f5fa9 Continuing work
- Fixed bugs in BaseMap-Addition/Removal
- Reworked handlers for TE Transposer & Smelter
- Added recipe logging for TE Transposer & Smelter
2015-07-03 17:09:37 +02:00
Zixxl
149d52bb6c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java
2015-07-01 22:11:41 +02:00
Tobias Wohlfarth
bb23195bf7 improved: Railcraft Cokeoven, is now Undoable and easier ZenScript functions
modified:   src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java
2015-07-01 19:21:53 +02:00
Zixxl
325f4496e4 Added command to print TConstruct recipes 2015-07-01 13:55:19 +02:00
Zixxl
0929891f38 Prevent execution of commands with missing parameters 2015-07-01 12:04:55 +02:00
Zixxl
0b18e5c12e Added command to print Botania recipes 2015-07-01 11:04:44 +02:00
Jared
e84eb65fb6 Merge pull request #168 from Voidi/master
fix #117: Railcraft Coke oven recipe remove;
2015-06-30 22:48:47 +02:00
Tobias Wohlfarth
c17791e99c fix #117: Railcraft Coke oven recipe remove; equal() is not the same as isItemEqual 2015-06-30 22:35:17 +02:00
Zixxl
a0a8f2f26e Minor improvements for AE2 recipe logging 2015-06-30 18:04:26 +02:00
Zixxl
152fa40b9a Added command to print AE2 recipes
- Added command "/mt ae2" to log all Applied Energistics 2 recipes.
2015-06-30 01:37:30 +02:00
Zixxl
f8d537e857 Applied Energistics 2 Fixes
- Fixed getRecipeInfo() for Grinder displayed output instead of input
- Fixed wildcard support for item damage
- Added Botania special flower support
- Tested all AE2 script functions
2015-06-29 17:15:23 +02:00
Zixxl
da33cc6fab ModTweaker2 Rework
- Revised base classes for IUndoableAction
- Reordered lots of code, so stuck actions should be less frequent
- Added wildcard support to many "remove" methods
- Started working on exist & duplicate checks
2015-06-29 16:36:35 +02:00
jaredlll08
f5034b04d8 No idea why injection adding isn't working.
anyone is free to take a look and give input
2015-06-28 15:29:39 +02:00
jaredlll08
a451413267 work on mekanism, will continue tomorow 2015-06-28 07:05:24 +02:00
jaredlll08
1d14aa1018 IMC support 2015-06-26 18:01:41 +02:00
Zixxl
dded005201 Fix for Thermionic Fabricator Cast removal
Fixed removing a cast from Thermionic Fabricator will lead to a
ClassCastException exception
2015-06-25 00:16:48 +02:00
jaredlll08
cc0f2fdc7a Removed the notice thing, wasn' working anyway 2015-06-23 16:03:10 +02:00
jaredlll08
c500a5a580 Made some changes, should help mod authors direct bugs to me 2015-06-19 13:14:23 +02:00
jaredlll08
daddadf7e7 derp 2015-06-19 02:01:03 +02:00
jaredlll08
8ae301084a @coolsquid is nice :) 2015-06-19 01:50:28 +02:00
jaredlll08
31a18e8e8f close #152 close #136 close #74 (maybe should be) 2015-06-19 01:40:36 +02:00
jaredlll08
0843cd0a64 close #147 2015-06-19 00:25:28 +02:00
Zixxl
2223aecd3e This would have broken a lot of stuff 2015-06-16 19:33:38 +02:00
Zixxl
090e19375a Most classes use getDisplayName() 2015-06-16 17:14:17 +02:00
Zixxl
891ee31ecb Also better logging for AE2 Grind recipe removal 2015-06-16 17:11:37 +02:00
Zixxl
e71fd16d11 Some code cleanup for better logging
Somehow related to issue #154. Now you get a correct warning.
2015-06-16 16:25:48 +02:00
Zixxl
5f92f1fc72 Some cleanup 2015-06-16 15:33:46 +02:00
Zixxl
1236d522e8 Fixes for last commit and better logging
- Fixed NoSuchElementException thrown if no recipe is removed
- Added warning, if no recipe could be found to remove
2015-06-16 13:39:12 +02:00
Zixxl
de099e4798 Reworked BaseListRemoval
- Fixed various crashes if no recipes are removed and the undo method is
called (e.g. on /mt reload), adding a null object.
- Added option to remove more than 1 recipe with BaseListRemoval
- Cleanup of some classes which are extending BaseListRemoval
2015-06-16 12:11:20 +02:00
Zixxl
8efaa6c92c Some renaming 2015-06-12 10:38:29 +02:00
Zixxl
be54331b31 Bugfix
- Fixed: getRecipeInfo fails for fluids
- More code cleanup for Pull-Request
2015-06-12 10:31:50 +02:00
Zixxl
f07b0c014d Some more tweaks
- Code cleanup
- Added ability to remove recipes for a liquid
2015-06-12 10:22:06 +02:00
Zixxl
25da86db52 Don't think we need removeTableRecipes 2015-06-10 18:06:19 +02:00
Zixxl
e63d34d5f5 Remove all the recipies for a casting 2015-06-10 18:03:50 +02:00
Zixxl
4b37bbc7b8 Tweaks for TinkersConstruct casting
- Fixed: Script crash if recipe is not present (maybe fixes issue #144)
- Added: Support to remove all recipies
2015-06-10 17:56:55 +02:00
jaredlll08
892524e253 Fixed ex nihilo stuff 2015-06-10 17:11:41 +02:00
Yulife
df829478b8 Revert "whoops"
This reverts commit 16d32dc620.
2015-05-03 15:04:29 +02:00
Yulife
d3ac446690 Revert "RemoveAll function for loot tiers"
This reverts commit b699a3a176.
2015-05-03 15:04:25 +02:00
Yulife
16d32dc620 whoops 2015-05-03 14:13:28 +02:00