Commit graph

316 commits

Author SHA1 Message Date
modmuss50
82aa0e730f
Update forge and mappings to latest 2017-06-21 09:07:36 +01:00
modmuss50
0509066e74
Bump version, #betaBuild 2017-06-20 22:07:02 +01:00
modmuss50
3071d19db0
Initial work on Auto crafting table. 2017-06-20 18:54:45 +01:00
modmuss50
2c9e08bd63
Update forge and move off gradle RC 2017-06-19 11:16:00 +01:00
modmuss50
7eaef93136
Fix server start-up crash, #betaBuild 2017-06-18 14:14:42 +01:00
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