Commit graph

361 commits

Author SHA1 Message Date
modmuss50
84cb99290d
#betaBuild 2017-06-17 17:49:03 +01:00
modmuss50
a9874131e9
Fix build for now 2017-06-17 17:42:33 +01:00
modmuss50
24faea17ba
Fixes issue in recipes + update forge 2017-06-15 12:07:03 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
modmuss50
358b3a48a7
Bump version, #releaseBuild 2017-06-02 20:39:06 +01:00
modmuss50
450765a0cf
Bump version, #releaseBuild 2017-06-02 16:25:38 +01:00
modmuss50
6eae3e637e
Hide cable in JEI + update JEI compat 2017-06-02 16:24:40 +01:00
modmuss50
a6d0e57d10
Add expensive quarry recipe back in. 2017-06-02 15:44:00 +01:00
modmuss50
672b3ac6f1
Add basic cable textures, needs some work 2017-05-27 01:02:50 +01:00
Modmuss50
fe775a10eb Contains quick fix for cable issues, #betaBuild 2017-05-25 23:03:27 +01:00
modmuss50
50d1db2695
Major powernet changes, #betaBuild 2017-05-18 20:51:36 +01:00
modmuss50
daf7a90a28
Bump version, #releaseBuild 2017-04-21 09:16:58 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support 2017-04-21 09:09:28 +01:00
ProfessorProspector
db3c7f0585 Bump version to 2.2 2017-04-14 12:35:09 -07:00
modmuss50
7013a7021d
Sign jars 2017-04-13 10:11:10 +01:00
modmuss50
cda60c7b8f
Update mappings to fix crash with FMP 2017-04-11 12:58:35 +01:00
modmuss50
39cc0f9452
Add FMP to gradle in prep for the cable rewrite. 2017-04-11 12:16:16 +01:00
modmuss50
569fd9665b Fix curse tools task always running 2017-04-11 00:21:30 +01:00
modmuss50
8c3be8366a fix deprecated warning in gradle. 2017-04-10 23:39:09 +01:00
modmuss50
9f11c9cc85
Bump version, #releaseBuild 2017-04-08 16:03:52 +01:00
modmuss50
8132620dcf
bump version, #releaseBuild 2017-03-14 13:30:20 +00:00
modmuss50
f1d878dc64
Fix incorrect URL for crafttweaker lib 2017-03-14 13:18:23 +00:00
modmuss50
7d10d64a43
Use 1.11 version :/ 2017-03-14 13:16:50 +00:00
modmuss50
aeedc67070
Use Ivy to get Crafttweaker 2017-03-14 13:16:31 +00:00
modmuss50
da6925195b
Update CraftTweaker support 2017-03-14 12:59:17 +00:00
modmuss50
e248cb5dc2
Merge 1.10.2 changes, #releaseBuild 2017-03-13 11:07:48 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
835e42befd
Bump version, #releaseBuild 2017-02-16 08:27:44 +00:00
modmuss50
3854f98535
bump version, #releaseBuild 2017-02-13 10:34:36 +00:00
Modmuss50
a1c438e752 Update build.gradle 2017-02-07 20:26:33 +00:00
modmuss50
d01b7d559d
Fix transitive dependencies on reborn core 2017-01-31 19:26:12 +00:00
modmuss50
be96f971e8
BumpVersion #releaseBuild 2017-01-31 13:37:18 +00:00
modmuss50
1886c123ac
Bump version, #releaseBuild 2017-01-18 17:13:34 +00:00
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