maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2291 commits 1 branch 0 tags 80 MiB
Commit graph

2291 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
karmishin
37fa8f9729 Merge pull request #2 from Sigens/patch-2 
Update ru_RU.lang
 2016-07-09 17:31:30 +04:00
karmishin
45b66bf30e Ingots and Nuggets 2016-07-09 16:31:04 +03:00
Sigens
1bbd5ec67e Update ru_RU.lang 2016-07-09 16:25:17 +03:00
karmishin
998eeb509e Merge pull request #1 from Sigens/patch-1 
Update ru_RU.lang
 2016-07-09 16:55:35 +04:00
Sigens
1302775237 Update ru_RU.lang 2016-07-09 15:54:51 +03:00
karmishin
2e0f43ac42 Update ru_RU.lang 2016-07-09 14:47:16 +03:00
karmishin
92169fa2da Update ru_RU.lang 2016-07-09 13:57:34 +03:00
karmishin
97236ab7e6 Update ru_RU.lang 2016-07-08 22:39:18 +03:00
karmishin
f239a10bb9 Created russian localization file 2016-07-08 21:58:30 +03:00
TehporP
6b89ff13ca Update zh_CN.lang (#666) 2016-07-07 09:53:05 +01:00
TehporP
9fac7ca1ab Updated .lang file (#663) 
* Updated .lang file

Rest of them will be finished by BTM

* Update zh_CN.lang

* Update zh_CN.lang
 2016-07-06 12:45:26 +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
fa9e941217 Update JEI 2016-07-01 15:55:44 +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
be336ec249 Fix ChargeHud 2016-06-06 20:22:56 +01:00
modmuss50
2c6cc4b298 Clean up ic2 recipes a little 2016-06-06 19:59:10 +01:00
modmuss50
7d0943ea5b Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
 2016-06-06 19:55:04 +01:00
modmuss50
9c0f0fa111 Started work on the recipe links 2016-06-06 19:52:46 +01:00