Commit graph

454 commits

Author SHA1 Message Date
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
40835a2773 Update forge version 2016-12-05 09:19:16 +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
71a5ec3e2a Add files back, blame git 2016-11-25 13:38:17 +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
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
ProfessorProspector
145124e3dd
Nanosaber now deactivates if it's out of power, and won't activate if there's not enough power.
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-11-05 16:28:18 +00: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
Nagisa·Jang
bd55547918 Update zh_CN.lang (#735) 2016-08-28 10:25:43 +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
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
Dragon2488
42d051cda3 Veins ore generation + fixes. 2016-08-01 20:59:20 +07:00
RarogCmex
ecfd3f88fd Update ru_RU.lang 30.07.16 v2
Помимо этой мелкой пыли так же кое-где перевел инструменты и доспехи (из рубина, сапфира, перидота)
2016-07-30 17:50:27 +05:00
Dragon2488
b292fdd352 Rewrite to use new RebornCore Power API. Texture fixes. 2016-07-21 22:22:56 +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
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
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
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
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
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
onVoid
223732e4ef Textures for andesiteDust, graniteDust, and dioriteDust 2016-06-05 10:50:30 -07:00
Prospector
b7e6e109aa Nanosaber still don't work 2016-06-05 10:41:00 -07:00
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00
Prospector
a719a1c563 Holy huge commit with unhelpful name batman!
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07:00
modmuss50
77eddc31b2 More lang for tool tips, closes #610 2016-06-04 11:40:52 +01:00
modmuss50
8a8fd59cc1 Add a way to rename and move the blockstates json file 2016-06-04 11:02:35 +01:00
Yulife
b09e60f774 Electrolyzer 2016-06-02 21:31:58 +02:00
Yulife
9cbebe6dbd Shoo IC2 Exp, Shoo 2016-05-30 16:11:40 +02:00
Yulife
9f0298b9d5 Nugget Removal 2016-05-30 14:04:17 +02:00
Yulife
341e862e37 Bunch of new item textures, move Lazurite to plates
... and relocation of some assets
2016-05-30 13:37:27 +02:00