Commit graph

476 commits

Author SHA1 Message Date
Modmuss50
09d4a98c97 Attempt to speed up gradle build. 2017-01-15 15:14:05 +00:00
Ourten
2f10c5704c Bump version, #releaseBuild 2017-01-15 15:56:40 +01:00
modmuss50
99002697ee
Bump version + reborncore #releaseBuild 2016-12-27 20:08:28 +00:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
3131556ec8
Bump version, #releaseBuild 2016-12-20 14:09:13 +00:00
modmuss50
ce64156a9c
Bump version, #releaseBuild 2016-12-17 15:10:17 +00:00
modmuss50
c12d5aaf1e Bump version, #releaseBuild 2016-12-14 21:43:07 +00:00
modmuss50
ccdb5c0761 Fix merge issues, fix build 2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/BlockRubberLog.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/items/tools/ItemElectricTreetap.java
#	src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
Thomas Guillemard
ebf569a906 Make treetap working with the IC2 rubber tree (Fix #786) (#831)
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b Merge 1.10 changes, bump version for #releaseBuild 2016-12-13 11:53:33 +00:00
modmuss50
40852ca113 Bump version, #releaseBuild 2016-12-13 11:48:21 +00:00
ProfessorProspector
7bd8cf8562 #betaBuild 2016-12-10 22:02:06 -08:00
ProfessorProspector
ab1628de58 Bump version for hotfix 2016-12-10 15:01:19 -08:00
ProfessorProspector
bd83c55754 Bump version #releaseBuild 2016-12-10 14:30:37 -08:00
modmuss50
3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
7426f4e3ed bump version for #releasebuild 2016-12-07 13:49:44 +00:00
modmuss50
4a19f4ac6b Bump version #releasebuild 2016-12-06 20:50:25 +00:00
modmuss50
bf60b32eb2 Version 2.0.0 #betaBuild 2016-12-05 13:13:42 +00:00
modmuss50
5782d2d032 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
40835a2773 Update forge version 2016-12-05 09:19:16 +00:00
modmuss50
0547999e0d
Bump version #releasebuild 2016-11-27 18:38:03 +00:00
ProfessorProspector
c53ab29cf1 Update TESLA 2016-11-26 17:15:59 -08:00
ProfessorProspector
018c761638 Update WAILA 1.9 to HWYLA 1.11 2016-11-26 14:34:54 -08:00
modmuss50
21833839e6
Bump version #releasebuild 2016-11-26 19:17:08 +00:00
modmuss50
6bf0a3b4bb
Add curse tools 2016-11-26 19:05:10 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
modmuss50
59bd497893
Fix issue with ore generation in some cases 2016-11-07 22:39:53 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
modmuss50
9e47eb8cfe
Auto set formatter for idea 2016-11-05 16:30:22 +00:00
modmuss50
c9ff3330ca
Fix #794, fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks 2016-11-05 15:10:28 +00:00
modmuss50
015620094c
1.4.9 2016-11-05 10:47:48 +00:00
modmuss50
603c12590d
Update to support RC 2.8 2016-11-04 20:03:05 +00:00
Modmuss50
0ece0aff33 Version Bump 2016-10-09 14:02:09 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732 2016-10-08 21:56:24 +01:00
modmuss50
38f965917f Fix Start-up crash + new version 2016-09-27 19:34:18 +01:00
modmuss50
0aaa00fd03 Version 1.4.5 2016-09-27 18:31:56 +01:00
Modmuss50
9310ffadc8 Bump JEI version to see whats broken 2016-09-27 16:03:30 +01:00
modmuss50
281537a417 Added rubber to ore dic 2016-09-18 20:56:29 +01:00
modmuss50
d73c9d335f Update build.gradle 2016-09-18 13:04:31 +01:00
modmuss50
edf266588f Fix wrench recipe issues
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
modmuss50
0a2e878b88 Fix #738 2016-09-07 08:21:42 +01:00
modmuss50
7aace619df Bump Version 2016-09-06 22:30:24 +01:00
modmuss50
d5ff2a42bb Fixes #723 and wrench works with ic2 machines now 2016-09-06 22:16:21 +01:00
Modmuss50
91945c8dc9 Only 1.10.2 now 2016-08-08 16:31:55 +01:00
modmuss50
cb44c79256 Remove needed block, update forge 2016-08-01 09:37:55 +01:00
Modmuss50
77134b5d7a Bump version for release 2016-07-25 08:19:34 -07:00
Modmuss50
6213060079 Update build.gradle 2016-07-25 08:15:05 -07:00
Archengius
320f30f8d9 Updated RebornCore version 2016-07-25 19:06:52 +07:00
Archengius
3150c50fa7 Bump version number 2016-07-25 18:54:42 +07:00
Dragon2488
8a053117c6 Bump version number & small NPE fix. 2016-07-22 00:21:32 +07:00
Archengius
6f54e3801f Wires now transfer energy from all mods and manages it as EU. (#686)
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.

* Fix TechReborn to work with latest RebornCore
2016-07-21 07:51:55 -07:00
modmuss50
adf9b8c0e4 Fix #676 2016-07-16 22:16:22 +01:00
Modmuss50
43bdf25ab3 Version 1.3.3 2016-07-16 18:11:06 +01:00
modmuss50
4fcefc84f3 1.10.2 2016-07-03 13:24:59 +01:00
modmuss50
7719633599 Added compatibility for 1.10 2016-07-01 15:58:15 +01:00
modmuss50
315c0aa509 Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e Revert a shit load of stuff 2016-07-01 15:40:46 +01:00
modmuss50
1acacd811b Version bump 2016-06-07 10:26:07 +01:00
modmuss50
daff9b8fa6 Add tesla jar 2016-06-05 22:47:38 +01:00
modmuss50
eaae9a380d Add ic2 to dev env, and attempt to fix a world gen crash 2016-06-04 18:04:30 +01:00
modmuss50
d80280b110 Fix random world gen crash - Fix electric furnace and version bump 2016-06-04 17:03:22 +01:00
modmuss50
207d42d81b The One Probe support 2016-06-04 14:53:16 +01:00
modmuss50
c968cd3b2e Update forge
Update mappings
Update Tinkers support - Closes #614
2016-06-04 11:31:53 +01:00
modmuss50
b59794f423 Do not build using the old MCMP 2016-06-01 12:07:54 +01:00
modmuss50
96235d2c9d Uses Reborncores version of MCMP 2016-06-01 12:06:51 +01:00
modmuss50
73d771dd72 Bump version 2016-05-28 19:39:29 +01:00
modmuss50
69bdb0034b Fix setting up dev workspace 2016-05-28 13:13:46 +01:00
Modmuss50
cec1cb7446 Update build.gradle 2016-05-28 10:06:54 +01:00
Modmuss50
8cb62c60d6 Update build.gradle 2016-05-27 07:52:37 +01:00
Modmuss50
deabc41653 Update build.gradle 2016-05-27 07:51:21 +01:00
Modmuss50
5815864c25 Update plugin 2016-05-27 07:48:55 +01:00
Modmuss50
4926dccf8d set the latest version of TechReborn to be the current one on mods.io 2016-05-26 19:50:38 +01:00
Modmuss50
40f1ff9be7 Update build.gradle 2016-05-26 19:48:43 +01:00
modmuss50
1b9e47206a Add modsio uploading 2016-05-26 17:31:02 +01:00
modmuss50
4033000205 Update to gradle 2.13 2016-05-25 16:14:21 +01:00
modmuss50
e224d48d1e Forge update 2016-05-25 11:11:24 +01:00
modmuss50
6156591b0e Disable manual downloading until its useful 2016-05-24 08:09:18 +01:00
modmuss50
106c24c29c Update version 2016-05-23 19:43:10 +01:00
modmuss50
ccb5ab7e2f Remove 1.9 deps 2016-05-22 13:24:44 +01:00
modmuss50
128a95c338 jei 1.9.4 and clean tile packets 2016-05-19 09:07:31 +01:00
modmuss50
f3a760ed4d Use fixed version of forge 2016-05-19 08:55:37 +01:00
modmuss50
83e2cd1310 Update forge 2016-05-18 19:19:22 +01:00
modmuss50
fcae1a54d7 Use 1.9.4, update mc multipart 2016-05-18 17:06:05 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
68b77fca0a Version 1.1.1 2016-05-16 16:09:28 +01:00
modmuss50
42b7f2b965 1.1 beta 2016-05-15 09:56:55 +01:00
modmuss50
bafc64f25d update tesla 2016-05-14 19:31:54 +01:00
Prospector
a6cfd90339 get tinkers in the dev env (no compat yet) 2016-05-08 10:26:40 -07:00
modmuss50
024d562415 Update forge 2016-05-07 13:44:00 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
modmuss50
ab88164dfb This might fix setup? 2016-05-06 19:49:23 +01:00
Modmuss50
70a5de1893 Version 1.0.6
This is the final 1.0.x build that I plan to do, next 1.1
2016-04-24 16:14:21 +01:00
modmuss50
e7f9c679df
Update forge and deps 2016-04-23 13:05:39 +01:00
modmuss50
4f93146ecb
fix gradle 2016-04-17 11:59:18 +01:00
modmuss50
e62bcc215e
moved designer to its own repo 2016-04-17 11:48:01 +01:00
modmuss50
8de90e6209
added exporter 2016-04-16 20:28:11 +01:00
modmuss50
58acfb9337
Fixes empty designer jar 2016-04-16 09:17:42 +01:00
modmuss50
70f458d089
Added designer jar 2016-04-16 09:02:33 +01:00
modmuss50
cdee0ddc06
Debof jar now runs the designer, this might change 2016-04-15 21:54:43 +01:00
modmuss50
e01a8ed4c1
Bump version 2016-04-13 17:14:19 +01:00
modmuss50
b822cee9fb Update walia, add MT and CT support back, Fix #519, update for new RC bucket thing 2016-04-13 13:47:02 +01:00
Modmuss50
1c3edcb571 Update build.gradle 2016-04-03 23:16:49 +01:00
modmuss50
8246f73e20 bump forge and deps 2016-04-03 19:25:52 +01:00
Modmuss50
15df117677 Version 1.0.4 2016-03-31 14:33:54 +01:00
Modmuss50
42d42a39fa Update build.gradle 2016-03-28 21:24:09 +01:00
Stuart Pomeroy
e6b1f4f07a Update reborn core 2016-03-28 11:41:16 +01:00
modmuss50
5846f1c784 Remove debug code, and 1.0.2 2016-03-27 17:58:41 +01:00
modmuss50
96464980c2 Fixed crash when not running with MCMP 2016-03-27 13:14:57 +01:00
modmuss50
02931939b6 Update mc multipart for new forge 2016-03-26 18:52:30 +00:00
Modmuss50
6616d72304 Update build.gradle 2016-03-26 18:11:47 +00:00
Stuart Pomeroy
ba2ad6aa4e FIX IT AGAIN! 2016-03-26 16:03:23 +00:00
Stuart Pomeroy
c4345bacae Fix a fuck up. 2016-03-26 16:01:06 +00:00
Stuart Pomeroy
6498bd1974 Update to forge and fuck up the cables? Not sure :P 2016-03-26 15:58:38 +00:00
Modmuss50
bc5c30dd3a Update build.gradle 2016-03-26 08:52:30 +00:00
modmuss50
a56bc65f3f Remove alpha tag 2016-03-23 19:03:23 +00:00
Modmuss50
4fa52983d5 Version 1.0.0-Alpha1
Time to write a changelog
2016-03-23 00:21:15 +00:00
modmuss50
eec6139d33 Update forge + powernet improvements 2016-03-22 20:03:46 +00:00
modmuss50
b41472089c Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
Conflicts:
	build.gradle
2016-03-22 11:39:20 +00:00
modmuss50
3d8c63e1f2 Clean up maven repos 2016-03-22 11:38:41 +00:00
Modmuss50
2afb906775 Update build.gradle 2016-03-22 00:48:46 +00:00
modmuss50
cb42f452c4 Update MCMP 2016-03-21 15:32:35 +00:00
modmuss50
492917ac95 Improvements to cable rendering. still broken, but not as bad 2016-03-20 10:58:58 +00:00
modmuss50
471a945de6 Its all broke, mcmultipart support 2016-03-19 18:01:34 +00:00
modmuss50
f255137753 Official forge 2016-03-18 11:08:30 +00:00
modmuss50
2bbc785dde Re-added JEI support, and update things 2016-03-18 08:29:29 +00:00
modmuss50
daa2397d0e Updates to gradle file 2016-03-16 20:50:37 +00:00
modmuss50
9a23c5d437 Update Mappings 2016-03-16 08:33:11 +00:00
modmuss50
9a40abbe78 Now comes the grind, 244 errors left 2016-03-13 16:08:30 +00:00
modmuss50
7e5e40a338 Added machine teirs (can someone check them)
Fixed crash when machines explode
2016-03-08 17:34:04 +00:00
modmuss50
57f91f3159 Cables now shock the entity's 2016-03-06 21:42:27 +00:00
modmuss50
5ed5aeea54 Revert "Gradle 2.11"
This reverts commit c8453292b4.
2016-03-02 16:35:03 +00:00
modmuss50
e680f3fb1f Updates, and re added support 2016-02-29 11:20:40 +00:00
modmuss50
b0cb4f87c5 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-02-29 08:15:23 +00:00
modmuss50
3f02e36690 update BOP 2016-02-29 08:13:40 +00:00
modmuss50
f9f460207e Java 1.8 2016-02-28 17:00:27 +00:00
modmuss50
d30b69c88d Remove test as it is pointless 2016-02-26 21:54:22 +00:00
modmuss50
c8453292b4 Gradle 2.11 2016-02-24 11:05:28 +00:00
modmuss50
de9daec7a8 Changes to support new jenkins 2016-02-23 21:59:06 +00:00
modmuss50
71c2bfee7f Moved power system to RC and spawn trees in groups 2016-02-20 16:59:31 +00:00
mezz
a1ef232b38 Update JEI, minor clean up of JEI integration 2016-02-17 23:44:15 -08:00
modmuss50
fb1d6f1074 Version 0.7.11 2016-02-16 22:05:43 +00:00
Modmuss50
ca693fbc8e Version 0.7.10 2016-02-13 09:10:56 +00:00
Modmuss50
484fec1680 Update build.gradle 2016-02-13 09:06:18 +00:00
modmuss50
99d69f3cbb Update to new RF API, closes #335 2016-02-10 13:15:02 +00:00
modmuss50
284e5d1d51 Add mc version to jar name 2016-02-09 17:43:46 +00:00
modmuss50
8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update 2016-02-02 21:05:42 +00:00
mezz
e4af69e861 Update JEI & Forge, add recipe click areas and rolling machine transfer 2016-02-01 17:59:23 -08:00
Modmuss50
e04a4a540f Prep for update for new reborn core 2016-01-24 11:37:43 +00:00
modmuss50
7e7ad74203 Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
2016-01-22 13:39:20 +00:00
modmuss50
7139a62102 Update to fixed Reborn core and bump version 2016-01-13 13:40:02 +00:00
modmuss50
a9a85bcd84 Now use none dev version of RebornCore 2016-01-13 11:13:38 +00:00
modmuss50
fbe51d98cd update forge 2016-01-13 11:07:47 +00:00
Modmuss50
6c3e0e47c3 Update build.gradle 2016-01-07 11:03:49 +00:00
mezz
a00543c67d Update to latest JEI 2016-01-06 00:46:23 -08:00
Modmuss50
01dfab2031 Update build.gradle 2016-01-01 21:33:13 +00:00
mezz
d1b4fe3027 update JEI version 2016-01-01 13:18:42 -08:00
mezz
5addee32e6 Add grinder recipes 2015-12-31 00:56:09 -08:00
modmuss50
dc7e565455 Update RebornCore 2015-12-31 00:03:17 +00:00
modmuss50
d5b4bbbad8 update BiomesOPlenty 2015-12-30 23:57:58 +00:00
modmuss50
1c28fa6e0a Revert "Disable BOP support to try and fix gradle crash"
This reverts commit 13f3d5757f.
2015-12-30 23:57:06 +00:00
modmuss50
6faa7a77ce bump version 2015-12-30 17:23:45 +00:00
modmuss50
13f3d5757f Disable BOP support to try and fix gradle crash 2015-12-30 17:17:16 +00:00
modmuss50
7240fef301 mod updates 2015-12-30 17:13:56 +00:00
modmuss50
54817286e6 Revert "test to fix build issue"
This reverts commit eed1a7a719.
2015-12-30 17:09:17 +00:00
modmuss50
0c7f07001b temp remove jei support to track down build issue. 2015-12-30 17:06:24 +00:00
modmuss50
eed1a7a719 test to fix build issue 2015-12-30 16:38:52 +00:00
modmuss50
895d5cfdd9 1.8.9 update 2015-12-30 11:57:06 +00:00
modmuss50
b2cd388527 remove this for later 2015-12-28 11:08:14 +00:00
modmuss50
d973d6b108 Added back some more compat 2015-12-28 10:57:22 +00:00
modmuss50
48a94205e2 Merge branch 'master' into 1.8.8
# Conflicts:
#	build.gradle
2015-12-19 09:53:54 +00:00
Modmuss50
024a13375e Version 0.7.4 2015-12-19 09:52:00 +00:00
modmuss50
8e3136ecf0 Update deps, for #307 2015-12-18 18:56:45 +00:00
Modmuss50
b924b3f36d Version 0.7.3 2015-12-14 11:08:11 +00:00
Modmuss50
abcaccdc82 Added waila support back 2015-12-13 19:41:46 +00:00
Modmuss50
67d2d9c863 Update reborn core 2015-12-13 18:09:48 +00:00
modmuss50
3b3deea57b update things 2015-12-13 13:29:15 +00:00
modmuss50
fb6b5135e4 Merge branch 'master' into 1.8.8
# Conflicts:
#	ToAddBack/partSystem/parts/CablePart.java
2015-12-12 17:39:23 +00:00
Modmuss50
cf3d795c27 Version 0.7.2 2015-12-12 17:38:18 +00:00
Modmuss50
f4a8c3519a Should fix build 2015-12-11 19:54:58 +00:00
modmuss50
c782b78959 Fixed build errors 2015-12-06 10:32:32 +00:00
modmuss50
ba90e49822 updated JEI, and improved support 2015-12-05 22:48:11 +00:00
modmuss50
5cf116d8a4 Missed conflict when merging 2015-12-05 20:32:18 +00:00
modmuss50
40f78c3938 Merge branch 'master' into 1.8.8
Conflicts:
	build.gradle
2015-12-05 20:30:20 +00:00
Modmuss50
7c039f3105 Now build against java 1.7 2015-12-05 20:27:57 +00:00
modmuss50
8d0cc231d6 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-12-05 20:23:52 +00:00
modmuss50
cf36bc9dc1 Fixes #293 and removed java doc 2015-12-05 20:23:40 +00:00
modmuss50
a795f90971 Update forge, fix ticking tiles. 2015-12-05 20:14:32 +00:00
Modmuss50
60d7b63d5b Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8
# Conflicts:
#	build.gradle
2015-11-29 12:29:42 +00:00
modmuss50
3fb7dd102b Inital Just Enough Items support 2015-11-29 10:42:34 +00:00
modmuss50
3367e990be Update to new forge and mappings 2015-11-29 09:52:45 +00:00
Modmuss50
86b60385c0 Update RebornCore 2015-11-29 09:38:37 +00:00
modmuss50
c02269f4d6 Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8 2015-11-28 12:52:04 +00:00
modmuss50
d5e2628f7a Some small tweaks 2015-11-28 12:51:49 +00:00
Modmuss50
708fb8afbd Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8 2015-11-28 12:35:52 +00:00
Modmuss50
1dd47833c2 Version 0.7.1 2015-11-28 12:32:44 +00:00
modmuss50
ae5bb56445 Update build.gradle 2015-11-27 20:56:31 +00:00
Modmuss50
d452ed5bfb Disable src jar 2015-11-26 20:50:17 +00:00
Modmuss50
7370784c7f More textures 2015-11-26 20:43:56 +00:00
Modmuss50
82b99fed34 update forge and mappings 2015-11-26 08:26:09 +00:00
Modmuss50
fa11ff13bc Build fix while waiting for an ic2 update 2015-11-24 19:44:24 +00:00
Modmuss50
46f4dc5d95 Prep for jenkins 2015-11-24 19:37:15 +00:00
Modmuss50
14ee45fcde 6518 2015-11-23 14:37:18 +00:00
modmuss50
7bcc793d12 Added javaDoc and updated deps 2015-11-22 16:24:50 +00:00
Modmuss50
66993f7239 Gradle 2.9 2015-11-18 11:22:56 +00:00
Modmuss50
798742fd20 Version 0.7.0 2015-11-17 17:44:21 +00:00
Modmuss50
473a981f51 Hot fix 0.6.1 and Fusion Reactor API 2015-11-16 20:27:45 +00:00
Modmuss50
25b5715ab8 Version 0.6.0 2015-11-15 21:13:28 +00:00
Modmuss50
351d7afadb Update reborn core 2015-11-11 17:37:14 +00:00
modmuss50
ef03cf50a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
Modmuss50
88f4737772 Version 0.5.6 2015-11-02 21:22:52 +00:00
modmuss50
edddb552c8 Version 0.5.5 2015-10-25 10:08:47 +00:00
modmuss50
5187f36fcd gradle 2.8 2015-10-22 18:40:29 +01:00
Modmuss50
adb340feec Version 0.5.4 2015-10-18 13:52:55 +01:00
modmuss50
a74154688c Fixes #190 2015-10-17 20:21:43 +01:00
Modmuss50
03932c7e22 version 0.5.3 2015-10-08 08:27:29 +01:00
Modmuss50
48c52bd79d version 0.5.2 2015-10-06 20:53:16 +01:00
Modmuss50
e8df232d75 Small issue with build script 2015-10-03 14:12:30 +01:00
modmuss50
3708a49bb9 Initial update to forestry 4(Sawmill recipes are not working) 2015-10-03 10:21:13 +01:00
Modmuss50
6a2c1e1c85 version 0.5.1 2015-10-02 07:48:44 +01:00
Modmuss50
3a256ad6f1 updated ic2 classic api 2015-09-29 08:17:24 +01:00
Modmuss50
15286baaa5 Started adding automated tests 2015-09-28 20:30:24 +01:00
Modmuss50
b5d4242029 Update a handful of dependencies 2015-09-28 20:00:39 +01:00
Modmuss50
b6259659e7 V 0.5.0 2015-09-26 16:36:02 +01:00
Modmuss50
111c5e6d5c closes #152 the rewirten version is not their maven. 2015-09-23 16:16:53 +01:00
Modmuss50
d10c64be7f version 0.4.3 2015-09-15 18:38:00 +01:00
Modmuss50
0bf7e1968e Fixed ic2 classic support on the master! 2015-09-14 21:05:26 +01:00
modmuss50
65f3b30c51 Beta 0.4.2 2015-09-08 19:11:13 +01:00
modmuss50
9c5c016976 Added forestry api and removed needed source files in output jar 2015-09-08 13:04:05 +01:00
modmuss50
5b1ee4cddc Beta 0.4.1 2015-09-07 21:03:47 +01:00
modmuss50
3b6202bece Fixes #133, can now run standalone without ic2 2015-08-27 16:29:13 +01:00
modmuss50
5bceef3297 Version 0.4.0 2015-08-27 13:16:13 +01:00
gigabit101
85d19144b0 ALPHA 0.3.2 2015-08-15 23:38:22 +01:00
modmuss50
33c2375246 Updated things 2015-08-15 17:16:05 +01:00
modmuss50
b4d9a7d9d5 Version: ALPHA 0.3.1 2015-08-06 18:40:12 +01:00
modmuss50
f8803f3be1 Removed the univseral jar appendix, fixed small typo 2015-08-05 10:13:05 +01:00
modmuss50
f4e45916e2 Alpha 3 2015-08-04 17:47:38 +01:00
modmuss50
cab1691821 bump forge 2015-08-04 10:33:10 +01:00
modmuss50
984b502ded fixes #85 , Fixes issues with RF output 2015-07-23 10:13:37 +01:00
modmuss50
38b73cd6a7 Added minetweaker to build script, for #70 2015-07-02 19:55:06 +01:00
modmuss50
c836e06678 Fixed mcmod.info stuff not getting replaced, removed the appendix on the file name because it was not needed 2015-07-01 16:53:03 +01:00
modmuss50
5b06a20351 Added ASM Method and Field stripper, more work on own power net 2015-07-01 16:41:40 +01:00
modmuss50
6ce5bb3063 Last time fixing the mcmod.info file 2015-06-23 23:41:03 +01:00
modmuss50
fbe5bfd915 Fixing the mcmod.info file again 2015-06-23 23:36:11 +01:00
modmuss50
6289d732e9 Fixed version in mcmod.info file 2015-06-23 23:30:02 +01:00
modmuss50
eb45fb8935 Might fix mcmod.info having the wrong version 2015-06-23 23:24:14 +01:00
modmuss50
482c07d991 Some small fixes to the gradle script. 2015-06-22 21:32:46 +01:00
modmuss50
45783b55f1 Fixes #38 on new ic2's 2015-06-19 18:07:15 +01:00
modmuss50
2ded7e0121 Added lesu logic. updated fmp to allow extra utils to run 2015-06-14 15:58:49 +01:00