Commit graph

163 commits

Author SHA1 Message Date
jaredlll08
53a906e38d Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java
2015-04-24 23:27:18 +02:00
jaredlll08
0f461a7815 Fixed a few mods reloading 2015-04-24 23:25:07 +02:00
Jared
c81d3d209a Merge pull request #120 from Voidi/master
add: set execution rights for the 'gradlew' file (better for non-Windows Users)
2015-04-23 01:26:55 +02:00
Tobias Wohlfarth
e0d36a1f7a add: set execution rights for the 'gradlew' file (better for non-Windows Users)
modified:   gradlew
2015-04-22 15:21:09 +02:00
Jared
60c3ac6d6b Merge pull request #119 from Turkey2349/master
- Updated all exnihilo mod hookins
2015-04-20 04:29:49 +02:00
Turkey
80f03ba32b - Updated all exNihilo mod hookins 2015-04-19 22:18:05 -04:00
Yulife
c757841e06 Merge pull request #115 from 3TUSK/master
Add basic support for TerraFirmaCraft
2015-04-19 10:20:14 +02:00
3TUSK
504f150711 Finally! 2015-04-18 18:39:26 -04:00
3TUSK
78d97bd885 I think I finished...! 2015-04-18 14:24:35 -04:00
3TUSK
726dda30c9 Add loom and fire pit support
Also minor tweak
2015-04-17 21:00:22 -04:00
3TUSK
a6d9ccc489 Wrong javadoc text
just fix wrong description…
2015-04-16 22:36:06 -04:00
3TUSK
c993642aab Initial finishing remove function
Untested.
2015-04-16 22:20:26 -04:00
Yulife
f7c0deaba7 Merge pull request #113 from Turkey2349/master
Fixed the ability to add custom recipes for the exNihilo Sieve
2015-04-16 07:42:20 +02:00
3TUSK
1729312f5c Initial start TerraFirmaCraft support
TweakedFirmaCraft!
2015-04-15 23:37:30 -04:00
Turkey
9cfadada68 - Fixed the ability to add custom recipes for the exNihilo Sieve 2015-04-14 17:15:24 -04:00
jaredlll08
bd16c93254 Updated some mods \o/ 2015-04-14 00:09:11 +02:00
jaredlll08
8fa42fd771 I may have lied... @joshiejack 2015-04-13 23:02:34 +02:00
Jared
0f1b852db6 Merge pull request #109 from hilburn/master
Mek v8
2015-04-09 08:05:18 +02:00
hilburn
2cc4aff86b Mek v8 2015-04-07 23:16:53 +01:00
Yulife
cf3ce11fc8 Merge pull request #98 from Voidi/master
fix: #97 add items to list for Forestry Squeezer filtered input
2015-03-29 11:09:04 +02:00
Tobias Wohlfarth
0cc7032a0d fix: #97 add items to list for Forestry Squeezer filtered input
modified:   src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java
2015-03-23 02:02:19 +01:00
jaredlll08
e0b56a73ca Close #58 2015-03-19 12:55:04 +02:00
jaredlll08
d7bb1f005f Close #64 2015-03-19 12:15:17 +02:00
jaredlll08
25feee0162 Smeltery fix and various others 2015-03-17 23:07:19 +02:00
Yulife
570e4f8607 Merge pull request #81 from Voidi/master
fix: #80 cant remove ThermionicFabricator recipes
2015-03-05 00:51:09 +01:00
Tobias Wohlfarth
4e80e22c53 fix: #80 cant remove ThermionicFabricator recipes
modified:   src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java
2015-03-05 00:41:10 +01:00
jaredlll08
0c257cfd9f Fix AE2 2015-02-25 21:51:27 +02:00
jaredlll08
df9ca0fd1a Fix AE2 inscriber 2015-02-25 21:02:47 +02:00
jaredlll08
e238d545a6 ninja close #77 2015-02-25 13:47:16 +02:00
jaredlll08
c13c297749 @joshiejack is a scrub who doesn't know how a for loop works... 2015-02-24 22:48:59 +02:00
jaredlll08
aeb42cd64e Aura Cascade support! 2015-02-23 14:42:40 +02:00
jaredlll08
d35d9b1f69 Update Thermal Expansion 2015-02-22 18:34:06 +02:00
jaredlll08
1a8d2c6cac Fix TE not working 2015-02-22 15:23:40 +02:00
jaredlll08
cb9ece6e1f Fix Rune Alter and Inscriber callers 2015-02-22 14:45:28 +02:00
jaredlll08
b90e99bf0d close #69 2015-02-22 14:16:10 +02:00
jaredlll08
991b37a588 Close #70 2015-02-22 14:02:26 +02:00
jaredlll08
dd69536606 closes #34 2015-02-22 01:23:09 +02:00
jaredlll08
b970140f69 mcmod.info update 2015-02-22 00:16:55 +02:00
jaredlll08
ba5f035af8 remove dead code 2015-02-21 23:45:07 +02:00
jaredlll08
24b41792d0 update Thermal expansion to new alpha/beta/the latest one 2015-02-21 23:32:06 +02:00
jaredlll08
f024a39179 Merge remote-tracking branch 'origin/dev' 2015-02-21 18:10:10 +02:00
jaredlll08
affd82eac4 Removes dead method 2015-02-21 01:18:26 +02:00
jaredlll08
ec562b62ea This closes #17 and closes #58, I tested and it worked using the script given
Also changes like all packages
inb4 "jared changes a package name in ModTweaker2 breaking compatability
with everything" drama tweet.
2015-02-20 23:57:32 +02:00
jaredlll08
4fd2551072 applied energistics tests, not working please hep 2015-02-14 19:11:38 +02:00
Yulife
1839a9071b Merge pull request #63 from Voidi/forestry
fix: Yet another Carpenter bug
2015-02-11 20:20:47 +01:00
Tobias Wohlfarth
a403b8c15c fix: Yet another Carpenter bug
modified:   src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java
2015-02-11 20:08:49 +01:00
jaredlll08
67a1cccaef sigh 2015-02-06 17:49:30 +02:00
jaredlll08
2278ad1db2 again... 2015-02-06 17:31:06 +02:00
jaredlll08
037af5364f When removing recipes, it removes all instances of the recipes 2015-02-06 17:14:15 +02:00
jaredlll08
380559fdb8 Fixed slag furnace, put in some extra checks for crucible, vat and smeltery 2015-02-06 14:40:33 +02:00