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

2223 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
modmuss50
973f68496c Merge branch '1.9.4' into 1.9.4-ic2 
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
 2016-06-06 19:02:19 +01:00
Prospector
df7cd4da1a Update README.md 2016-06-05 16:22:18 -07:00
modmuss50
daff9b8fa6 Add tesla jar 2016-06-05 22:47:38 +01:00
onVoid
039aab3e41 Added grinder recipes for gems -> dust (#628) 2016-06-05 22:05:44 +01:00
Prospector
42faf2357c Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-05 12:42:32 -07:00
Prospector
20e0c1482e added compressor test 2016-06-05 12:42:19 -07:00
modmuss50
55e6f70900 Fix last PR 2016-06-05 20:41:54 +01:00
Modmuss50
d5e83cacb6 Merge pull request #626 from onVoid/patch-1 
Added grinder recipes for ingot -> dust
 2016-06-05 20:38:44 +01:00
modmuss50
d84bffce46 Fix nanosaber 2016-06-05 20:37:22 +01:00
onVoid
83e116f4b5 Added grinder recipes for ingot -> dust 2016-06-05 12:36:39 -07:00
modmuss50
895319ed67 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-05 19:43:28 +01:00
modmuss50
4d29af274e Balance power recipes 2016-06-05 19:43:17 +01:00
Prospector
d651b73778 Merge pull request #624 from onVoid/1.9.4 
Textures for andesiteDust, graniteDust, and dioriteDust
 2016-06-05 10:52:07 -07:00
onVoid
223732e4ef Textures for andesiteDust, graniteDust, and dioriteDust 2016-06-05 10:50:30 -07:00
Prospector
0a90c8595b Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-05 10:41:22 -07:00
Prospector
b7e6e109aa Nanosaber still don't work 2016-06-05 10:41:00 -07:00
Yulife
5bf5c4fff3 Energy Armor Textures 2016-06-05 14:12:02 +02:00
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00