modmuss50
a5550b9bb4
Fix a load of issues
2016-09-19 20:58:34 +01:00
modmuss50
0f8bb12fea
Fix missing gui textures
2016-09-19 20:21:47 +01:00
modmuss50
281537a417
Added rubber to ore dic
2016-09-18 20:56:29 +01:00
modmuss50
e68309f3bf
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
2016-09-18 13:04:41 +01:00
modmuss50
d73c9d335f
Update build.gradle
2016-09-18 13:04:31 +01:00
Dylan Ryman
f8182637ee
Fixed some grammar mistakes in your readme ( #746 )
...
A programmer that sees this awesome project shouldn't have their first impression ruined by obvious grammar mistakes in the readme.
2016-09-17 09:18:30 +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
aefe9f6a36
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
2016-09-06 22:16:29 +01:00
modmuss50
d5ff2a42bb
Fixes #723 and wrench works with ic2 machines now
2016-09-06 22:16:21 +01:00
Nagisa·Jang
bd55547918
Update zh_CN.lang ( #735 )
2016-08-28 10:25:43 +01:00
Utoc
2ae38dea9e
Slot index changes ( #734 )
...
Changes slot index values to allow machines to be pulled from.
2016-08-27 08:02:44 +01:00
Modmuss50
1bc7259559
Update build.gradle
2016-08-13 11:47:28 +01:00
Zygimantas
bda861454c
fixed #722 ( #729 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
* Fixed #722 with a null ore check
2016-08-10 21:57:38 +01:00
Zygimantas
cf46fea074
Electrolyzer recipes ( #728 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
2016-08-10 20:33:49 +01:00
modmuss50
d96149fc97
Revert "Power system re-write, recipe fixes."
...
This reverts commit d982cc4028
.
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-08-10 00:51:44 +01:00
modmuss50
aa05d906f9
Revert "Wires now transfer energy from all mods and manages it as EU. ( #686 )"
...
This reverts commit 6f54e3801f
.
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2016-08-10 00:45:33 +01:00
modmuss50
cdae866b2d
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
...
This reverts commit b292fdd352
.
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
2016-08-10 00:45:07 +01:00
modmuss50
9b882e75ce
Revert "Bump version number & small NPE fix."
...
This reverts commit 8a053117c6
.
# Conflicts:
# build.gradle
2016-08-10 00:32:43 +01:00
modmuss50
e3384e3266
Revert "Small order fix."
...
This reverts commit 74e0c3669f
.
2016-08-10 00:30:23 +01:00
modmuss50
575773a6b3
Revert "RF wires fix."
...
This reverts commit fe64b8ccf7
.
2016-08-10 00:30:16 +01:00
modmuss50
8a0d981018
Revert "Fusion reactor fixes & rewrite, energy fixes."
...
This reverts commit 06fad2264f
.
2016-08-10 00:30:08 +01:00
modmuss50
22fd152ec9
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
...
This reverts commit be4f10b975
.
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
Modmuss50
91945c8dc9
Only 1.10.2 now
2016-08-08 16:31:55 +01:00
Nico
5f5c43ab96
Added new textures + translation optimizations ( #711 )
...
* Added new textures + translation optimizations
* Removed old textures
* Added new textures
2016-08-03 21:39:04 +01:00
Nagisa·Jang
3fea177b1f
fix the mistakes ( #712 )
2016-08-02 14:59:41 +01:00
Nico
9a73c3321e
First few Fixes ( #707 )
...
* Fixed missing translations
The Plates were only typos...
* Removed old textures
* Added new textures
* Fixed typo for texture
2016-08-02 00:35:00 +01:00
modmuss50
bbc5a636f1
Added ore vein config
2016-08-01 15:30:55 +01:00
Dragon2488
f03fbef70e
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-08-01 21:00:30 +07:00
Dragon2488
42d051cda3
Veins ore generation + fixes.
2016-08-01 20:59:20 +07:00
modmuss50
cb44c79256
Remove needed block, update forge
2016-08-01 09:37:55 +01:00
Dragon2488
25e709239f
Oops
2016-08-01 01:25:42 +07:00
Dragon2488
c8301e4db3
Veins ore generation system. WIP.
2016-08-01 01:12:55 +07:00
Andrew Burns
5898de8d8f
Fix typo in config file ( #701 )
...
Client was spelt wrong
2016-07-30 15:30:11 -07:00
Archengius
57e66a26f4
Merge pull request #698 from RarogCmex/patch-2
...
Update ru_RU.lang 30.07.16 v2
2016-07-30 19:54:30 +07:00
RarogCmex
ecfd3f88fd
Update ru_RU.lang 30.07.16 v2
...
Помимо этой мелкой пыли так же кое-где перевел инструменты и доспехи (из рубина, сапфира, перидота)
2016-07-30 17:50:27 +05:00
Dragon2488
7f02559357
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-07-29 01:52:08 +07:00
Dragon2488
5af14bbf01
Grinder recipes fixes and auto-generation for ores, gems and ingots through ore dictionary
2016-07-29 01:28:59 +07:00
Dragon2488
a5a9460707
Automation fixes, upgrades fixes.
2016-07-27 17:51:03 +07:00
Archengius
7fd61d2c19
Merge pull request #693 from laz2727/patch-1
...
Fix Tinkers Construct crashing
2016-07-25 23:35:29 +07:00
laz2727
99057a8e8e
Fix Tinkers Construct crashing
...
Probably.
2016-07-25 20:27:33 +04: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
be4f10b975
Energy storages item charging fixes, transformers fixes, electric items fixes.
2016-07-25 15:10:55 +07:00
Dragon2488
b42b5274b5
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
2016-07-25 02:26:15 +07:00
Dragon2488
0011553cf7
Sawmill changes & fixes.
2016-07-24 01:10:37 +07:00
Dragon2488
06fad2264f
Fusion reactor fixes & rewrite, energy fixes.
2016-07-22 21:45:55 +07:00