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 |
|