Commit graph

632 commits

Author SHA1 Message Date
Jared
2a175a112d updated forge and some mods 2017-03-11 16:47:29 +02:00
Jared
ec3f404921 Merge pull request #436 from laod/jei-hack
Jei hack
2017-03-11 15:07:58 +02:00
laod
9a182197b3 Improve forestry recipe JEI behavior. Moistener still broken. 2017-02-04 21:54:26 -06:00
laod
88911ecf77 JEI Hack for all but the moistener. 2017-02-04 15:27:15 -06:00
laod
468a626aa4 Forestry JEI recipe hack example. 2017-02-04 13:15:33 -06:00
Jared
10a319dc53 Merge pull request #424 from laod/master
Fix adding forestry recipes
2017-02-01 22:23:03 +02:00
Jared
205ac51806 Update README.md 2017-02-01 21:41:37 +02:00
laod
6999acdbdf Clean up remaining forestryHelper deps. 2017-02-01 12:10:39 -06:00
laod
dd90ffcb50 Fix adding forestry recipes. 2017-02-01 01:21:26 -06:00
Jared
811695c097 Close #423 2017-01-24 17:16:21 +02:00
Jared
68eaaeacf7 Merged branch master into master 2017-01-18 22:44:59 +02:00
Jared
3c0f5c6fe1 Close #421
All TiC stuff works besides for Casting, that one needs more work
2017-01-18 22:44:46 +02:00
Jared
fe45c2fa10 Update ISSUE_TEMPLATE.MD 2017-01-12 05:08:49 +02:00
Jared
a1e00118e4 Version update 2017-01-05 05:05:40 +02:00
Jared
0e270c617d Close #405 2017-01-05 04:49:29 +02:00
Jared
aa6ff4d03e Revert "Updated mods"
This reverts commit e490c3cc53.
2017-01-05 04:34:42 +02:00
Jared
e8a7b510b8 Revert "Changed back to jar files because of gradle issues"
This reverts commit a595471086.
2017-01-05 04:34:33 +02:00
Jared
e116da35c0 Removed Applied Energistics support.
Every single time I update Applied Energistics, their api has made a drastic change breaking my compat with them. Most times it is small stuff, like a changed field name, but this time it was big enough, and made such an impact, it is causing me to drop support.
2017-01-05 02:04:13 +02:00
Jared
a595471086 Changed back to jar files because of gradle issues 2017-01-05 01:57:13 +02:00
Jared
e490c3cc53 Updated mods 2017-01-05 01:09:10 +02:00
Jared
91874cef8b Merged branch master into master 2017-01-03 17:41:16 +02:00
Jared
018c93af74 Close #127 2017-01-03 17:40:51 +02:00
Jared
53d1f8b799 Create ISSUE_TEMPLATE.MD 2017-01-01 03:25:54 +02:00
Jared
71ff3953ed updated AE2 grinder 2016-12-25 20:33:42 +02:00
Jared
9d2b0762d6 Fixed AE2 jar 2016-12-25 20:28:14 +02:00
Jared
3a7c46c28d Carpenter varrags fix 2016-12-25 20:23:47 +02:00
Jared
edc7eea29b Version update 2016-12-25 20:21:35 +02:00
Jared
8a85224137 Revert "Version update"
This reverts commit 17924cf6f6.
2016-12-25 20:21:05 +02:00
Jared
17924cf6f6 Version update 2016-12-25 20:20:06 +02:00
Jared
5c6e9d11a8 Merge pull request #401 from elucent/master
Fixed Mixer recipes.
2016-12-18 17:02:09 +02:00
elucent
ab042491b8 Fixed Mixer recipes. 2016-12-18 09:51:22 -05:00
Jared
e4b485f852 Fixes forestry issues 2016-12-12 21:39:07 +02:00
Jared
7884619f54 Add Embers jar 2016-12-03 12:43:28 +02:00
Jared
62cb447f65 Version bump and added AE jar 2016-12-02 23:21:29 +02:00
Jared
518dddcc88 Merge pull request #392 from elucent/master
Embers support.
2016-12-01 15:51:56 +02:00
elucent
32e081b89f Re-added applied energistics, since it somehow got removed. 2016-12-01 00:45:13 -05:00
elucent
f6c1e6ed35 Fixed main mod class being messed up. 2016-12-01 00:42:58 -05:00
elucent
bb3e19741c Added embers support. 2016-12-01 00:38:30 -05:00
Jared
16ffe719d1 Close #383 2016-12-01 03:49:32 +02:00
Jared
cf613c6a34 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/main/java/modtweaker/ModTweaker.java
2016-12-01 03:45:07 +02:00
Jared
a654106030 Close #391 2016-12-01 03:24:57 +02:00
Jared
d7453f616d Merge pull request #389 from way2muchnoise/master
Adds RefinedStorage support
2016-12-01 02:38:22 +02:00
Jared
fbc9098a58 Close #388 2016-12-01 02:27:28 +02:00
way2muchnoise
cb07904e6e add RefinedStorage support, closes #376 2016-11-15 20:50:03 +01:00
Jared
356299fc17 version update 2016-11-04 13:01:31 +02:00
Jared
bb53897d1a Added chisel commands back. Close #370 2016-11-04 12:28:03 +02:00
Jared
5dbff3f794 Moved to MTLib
https://github.com/jaredlll08/MTLib/
2016-10-27 21:30:30 +02:00
Jared
8cff01c629 No. 2016-10-22 13:26:04 +02:00
Jared
8b2ab76328 Merge pull request #380 from al132/master
Add Basic support for Actually Additions
2016-10-21 21:12:32 +02:00
al132
585c882504 Minor changes 2016-10-20 22:49:49 -05:00