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
Dragon2488
fe64b8ccf7
RF wires fix.
2016-07-22 01:46:43 +07:00
Dragon2488
74e0c3669f
Small order fix.
2016-07-22 01:03:36 +07:00
Dragon2488
8a053117c6
Bump version number & small NPE fix.
2016-07-22 00:21:32 +07:00
Dragon2488
b292fdd352
Rewrite to use new RebornCore Power API. Texture fixes.
2016-07-21 22:22:56 +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
23419451e7
Merge branch 'Dragon2488-1.9.4' into 1.9.4
2016-07-19 11:47:09 -07:00
modmuss50
10aa2f2ffb
fix merge
2016-07-19 11:46:53 -07:00
Prospector
cfb93c4bc3
Merge pull request #684 from al132/1.9.4
...
Fixes #649 , #644 , 662, 606
2016-07-18 23:00:24 -07:00
al132
aa8fbbb7bc
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerExtractor.java
2016-07-19 00:21:18 -05:00
al132
f4cd3fc818
Leaves Constructor reverted
2016-07-18 23:37:02 -05:00
al132
7a6df30d10
Rubber and recipe fixes
2016-07-18 23:26:41 -05:00
Dragon2488
d982cc4028
Power system re-write, recipe fixes.
...
Please note that this version breaks all wires placed in worlds before.
2016-07-18 11:57:52 +07:00
al132
166f9a924f
Fixed Output of extractor ( #679 )
...
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
2016-07-18 02:06:47 +01:00
al132
1fb668cad4
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
2016-07-17 17:44:27 -05:00
al132
84b5de3417
Oops
2016-07-17 17:38:10 -05:00
al132
9e2c23d04a
Fix Extractor insertion and extraction
2016-07-17 17:36:40 -05:00
al132
48cbda6453
Add CraftTweaker support for the Compressor ( #677 )
2016-07-17 21:31:56 +01:00
al132
ea74721945
Add CraftTweaker support for the Compressor
2016-07-17 15:19:31 -05:00
al132
42ee2b7d57
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
2016-07-17 14:57:48 -05:00
modmuss50
fbc0d32407
Fix rare crash with the power net
2016-07-16 23:44:42 +01: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
Gigabit101
0fc5d74ad0
Merge pull request #674 from Dragon2488/1.9.4
...
Recipe fixes.
2016-07-16 16:57:27 +01:00
Dragon2488
25c581e129
Recipe fixes.
2016-07-16 22:17:44 +07:00
Dragon2488
33df1d3319
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. ( #673 )
2016-07-16 10:44:54 +01:00
al132
c1d645fd35
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
2016-07-16 02:39:40 -05:00
Prospector
ddb96d58ec
Merge pull request #672 from Dragon2488/1.9.4
...
Properly integration with IC2 through ore dictionary. JEI recipes...
2016-07-15 04:05:16 -07:00
Dragon2488
1f197c3728
Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions.
2016-07-15 17:28:41 +07:00
Prospector
31d1afa044
Merge pull request #671 from Dragon2488/1.9.4
...
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability…
2016-07-14 22:39:43 -07:00
Dragon2488
2b148f3d68
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid.
2016-07-15 12:15:09 +07:00
Prospector
82ad270713
Merge pull request #670 from al132/1.9.4
...
Fix CraftTweaker compatibility
2016-07-14 16:53:47 -07:00
al132
01516c93a3
Fix CraftTweaker compatibility
...
A version of CraftTweaker that is compatible with 1.9.4 has been
released since the Minetweaker/CraftTweaker dependency was removed. I
have restored compatibility with the new version of CraftTweaker
2016-07-14 17:15:36 -05:00
Gigabit101
2296e6fc18
Merge pull request #668 from karmishin/1.9.4
...
Russian localization
2016-07-11 20:54:15 +01:00
karmishin
a42ad99ea1
Update ru_RU.lang
2016-07-09 23:12:09 +03:00
karmishin
91a1c7d4c3
Dusts translated
2016-07-09 22:48:41 +03:00