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
|
e6c58a04b7
|
Fix Lapotronic Orb
|
2016-12-05 10:54:46 +00:00 |
|
modmuss50
|
72f85d5243
|
Auto format code.
|
2016-12-05 10:48:21 +00:00 |
|
modmuss50
|
a96c094267
|
Removed un used block.
|
2016-12-05 10:21:17 +00:00 |
|
modmuss50
|
8379115c97
|
Fix Machine Casings
|
2016-12-05 10:17:39 +00:00 |
|
modmuss50
|
c661f6b278
|
Fix Machine Casing Model
|
2016-12-05 10:07:41 +00:00 |
|
modmuss50
|
2fdce5405b
|
Improve block names
|
2016-12-05 09:40:55 +00:00 |
|
modmuss50
|
40835a2773
|
Update forge version
|
2016-12-05 09:19:16 +00:00 |
|
Prospector
|
f1ce404849
|
Delete Tesla-1.9.4-1.1.0.24-deobf.jar
|
2016-11-29 06:20:24 -08:00 |
|
modmuss50
|
c72c3b5851
|
Update JEI support, in a few places I could not figure it out, so there may be some issues.
|
2016-11-28 15:28:32 +00:00 |
|
modmuss50
|
9c33676b3d
|
Fix nuke texture
|
2016-11-28 13:05:11 +00:00 |
|
modmuss50
|
1dbc56f739
|
Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup).
|
2016-11-28 13:01:30 +00:00 |
|
modmuss50
|
cf9f2def43
|
Rename folder so git keeps correct caps
|
2016-11-28 12:55:06 +00:00 |
|
modmuss50
|
83ef3e7577
|
Start of new texturesm, again
|
2016-11-28 12:54:44 +00:00 |
|
modmuss50
|
360d9c2756
|
Fix language files not being applied.
|
2016-11-28 11:01:33 +00:00 |
|
Modmuss50
|
53dd546e6f
|
Update README.md
|
2016-11-27 22:24:07 +00:00 |
|
brad18
|
a5f306eb69
|
Fixes Compressor inputting items into output slot (#812)
|
2016-11-27 22:21:09 +00:00 |
|
modmuss50
|
0547999e0d
|
Bump version #releasebuild
|
2016-11-27 18:38:03 +00:00 |
|
modmuss50
|
54eee49e5d
|
Fix #810
|
2016-11-27 18:31:50 +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
|
b1b8537159
|
Fix log spam with some machines, closes #809 #releasebuild
|
2016-11-26 21:14:57 +00:00 |
|
modmuss50
|
21833839e6
|
Bump version #releasebuild
|
2016-11-26 19:17:08 +00:00 |
|
modmuss50
|
7fb93e89e7
|
Fix #808
|
2016-11-26 19:15:55 +00:00 |
|
modmuss50
|
3a470df08b
|
Fix #791
|
2016-11-26 19:10:29 +00:00 |
|
modmuss50
|
129895e559
|
Fix #803
|
2016-11-26 19:05:52 +00:00 |
|
modmuss50
|
6bf0a3b4bb
|
Add curse tools
|
2016-11-26 19:05:10 +00:00 |
|
modmuss50
|
757e311804
|
Fix #804
|
2016-11-26 19:01:10 +00:00 |
|
modmuss50
|
71a5ec3e2a
|
Add files back, blame git
|
2016-11-25 13:38:17 +00:00 |
|
modmuss50
|
e16c3eba02
|
Auto format
|
2016-11-25 13:25:51 +00:00 |
|
modmuss50
|
aceeb7a037
|
Fix resources #2
|
2016-11-25 13:24:01 +00:00 |
|
modmuss50
|
97b233dd44
|
Fix resources #1
|
2016-11-25 13:23:42 +00:00 |
|
FliegendeWurst
|
df74ca5176
|
Fix small formatting and spelling errors in readme (#807)
|
2016-11-24 19:42:22 +00:00 |
|
modmuss50
|
655c5979a0
|
Add lowercase resources back
|
2016-11-19 16:37:12 +00:00 |
|
modmuss50
|
fd07083129
|
Removed upppercase
|
2016-11-19 16:36:42 +00:00 |
|
modmuss50
|
528fecc2b5
|
Fix a load of null issues, and get it to sort of work.
|
2016-11-19 16:36:13 +00:00 |
|
modmuss50
|
65e651f402
|
It compiles, disable JEI as it needs redoing
|
2016-11-19 14:41:00 +00:00 |
|
modmuss50
|
a0e6a2dc34
|
Start on the update
|
2016-11-19 12:50:08 +00:00 |
|
Modmuss50
|
c8d8ce0241
|
yeah, that doesnt work
|
2016-11-15 17:00:16 +00:00 |
|
Modmuss50
|
22b8f5bcde
|
Testing https for curse badge
|
2016-11-15 16:57:56 +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 |
|
brad18
|
f5172ee496
|
Update ModRecipes.java (#787)
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes #783
|
2016-11-06 20:14:29 +00:00 |
|
modmuss50
|
d9d8845d6d
|
Added flare, still needs some textures
|
2016-11-06 19:14:43 +00:00 |
|
modmuss50
|
d75120bb00
|
Give more fluids power values
|
2016-11-05 17:55:50 +00:00 |
|
modmuss50
|
9ffdc3e36e
|
Fix world gen issues, you may need to delete ores.hjson
|
2016-11-05 17:54:00 +00:00 |
|
modmuss50
|
b60941ddd4
|
Fix grinder using twice is recommended power
|
2016-11-05 17:36:48 +00:00 |
|
modmuss50
|
29b0d2443f
|
Large buff to power usage, should fix #769
|
2016-11-05 17:22:24 +00:00 |
|
modmuss50
|
51331b77e7
|
Adjust MFE and MFSU values, closes #777
|
2016-11-05 17:09:57 +00:00 |
|
modmuss50
|
9767173152
|
Update .gitignore
|
2016-11-05 16:54:51 +00:00 |
|