Commit graph

459 commits

Author SHA1 Message Date
BloodWorkXGaming 65ef2d3d72 1.10.2: Fixed Nullpointers with bloodmagic and JEI on multiplayer (#492)
* Fixed Nullpointers with JEI on multiplayer

* Version bump
2017-06-27 20:41:39 +02:00
Jared 8b49478813 Close #453 2017-05-14 13:40:22 +02:00
Jared 2ff8b94e70 Version push 2017-05-08 23:21:40 +02:00
Jared bd57e409c6 Close #461 2017-04-28 01:32:11 +02:00
Jared 5ddc87a150 Fixes #439 and #476 2017-04-27 18:22:55 +02:00
Jared 5ff2b1fa7a Close #413 2017-04-27 18:20:10 +02:00
Jared eed0b56900 Removed CTGui support for the imbuing station
It was giving errors that I was having trouble fixing, honestly, noone uses CTGUI anyway, so I doubt it will be a huge issue
2017-04-27 16:37:16 +02:00
Jared 7376b24577 Updated mods 2017-04-26 19:10:10 +02:00
Jared 85348b7db2 Merge pull request #464 from famous1622/master
Make Embers Support not import Actually Additions classes
2017-04-04 00:50:25 +02:00
famous1622 d7f861c14d Make Embers not import actuallyadditions classes 2017-04-03 16:49:32 -04:00
Jared 4bf055b2c4 version push 2017-03-22 23:20:16 +02:00
Jared 627e795dfc Close #444 2017-03-22 02:01:08 +02:00
Jared 39036c3cd4 Close #433 2017-03-21 21:52:58 +02:00
Jared a6553f36ef close #426 2017-03-21 20:55:54 +02:00
Jared 1c88a2e4ce Close #441 2017-03-21 17:24:51 +02:00
Jared b09577861d Close #402 2017-03-20 17:40:42 +02:00
Jared 49ff1bbb1b close #399 2017-03-20 17:21:28 +02:00
Jared 55b66fa05a Close #443 2017-03-20 17:07:46 +02:00
Jared f4fb5a830f Close #442 2017-03-15 21:51:41 +02:00
Jared 3c2190e273 Updated libs and mappings 2017-03-15 21:51:33 +02:00
Jared 3412c2e36d Version push 2017-03-13 00:20:13 +02:00
Jared dfe689a480 Fixed chisel not working with metadata 2017-03-12 16:59:01 +02:00
Jared 94d69f8ba5 Close #435 2017-03-12 16:58:48 +02:00
Jared 04e5a559e0 Added a time param to the PureDaisy 2017-03-11 19:09:37 +02:00
Jared e4f357dffe Clsoe #410 2017-03-11 17:28:46 +02:00
Jared 82ddcfd9cf Merge branch 'jei-hack' 2017-03-11 16:55:03 +02:00
Jared 2876c6ddb5 Merge pull request #427 from laod/jei-hack
Improve forestry recipe JEI behavior. Moistener still broken.
2017-03-11 16:53:09 +02:00
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