Commit graph

2827 commits

Author SHA1 Message Date
Prospector
f05221d1ef Fix a couple unlocalized names 2017-06-16 08:30:13 -07:00
Prospector
b80235504f Fix the rest of the models & remove manual and heat generator 2017-06-16 08:20:30 -07:00
Prospector
977e0657ff Fix rubber tree stuff models 2017-06-16 07:32:11 -07:00
IvanSteklow
fb0b4b54cf Create ru_ru.lang (#1137) 2017-06-15 14:41:41 +01:00
modmuss50
a701094d1d
Update all license headers 2017-06-15 12:28:26 +01:00
modmuss50
24faea17ba
Fixes issue in recipes + update forge 2017-06-15 12:07:03 +01:00
modmuss50
ae0fa1abd7
Fix a large bunch of lang entry's 2017-06-15 11:42:53 +01:00
modmuss50
aa615f86bd
Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
modmuss50
5536a6cd94
Recipes can now show in the recipe book 2017-06-15 11:01:33 +01:00
Prospector
bdcb8bf327 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12 2017-06-15 00:01:51 -07:00
Prospector
cc27a1ed14 More WIP 2017-06-15 00:01:37 -07:00
modmuss50
5570a52539
Sawmill recipes work again 2017-06-14 23:50:49 +01:00
modmuss50
426001251f
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2017-06-14 23:30:35 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
Prospector
40e3062903 Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP) 2017-06-14 08:56:09 -07:00
Prospector
1fa9f1cf52 Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00
modmuss50
a4a4042eb1
Fix #775, The oldest open bug, and it only took me 5 mins 2017-06-13 22:37:03 +01:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
3400f42962
Lighten the oil texture, might revert it im not sure? 2017-06-13 21:27:06 +01:00
modmuss50
9619ada825
Added underground oil lakes 2017-06-13 21:16:17 +01:00
modmuss50
2292741443
Update walia support 2017-06-13 20:37:17 +01:00
modmuss50
cb0303d82f
Remove old int tiers 2017-06-13 20:28:50 +01:00
modmuss50
b1721890b5
Transformer improvements 2017-06-13 20:26:23 +01:00
modmuss50
1de4c4ff2b
Remove upgrade slots from Energy Storage blocks 2017-06-13 19:46:47 +01:00
modmuss50
c51b74fd68
Small fixes to the IDSU 2017-06-13 19:43:27 +01:00
modmuss50
5dd9fb14a1
Fixes item tool tips not rendering in gui's 2017-06-13 17:36:33 +01:00
modmuss50
70a2755796
Fix IDSU saving 2017-06-13 17:22:29 +01:00
modmuss50
44817f1a03
Use WorldStorage, but it still doesn't save :/ 2017-06-13 16:11:41 +01:00
modmuss50
f90bb45351
Move idsu manger to use capability's 2017-06-13 16:02:49 +01:00
modmuss50
14e30481e5
Improve IDSU 2017-06-13 13:14:02 +01:00
modmuss50
c4868a3264
Changes to the LightningRod 2017-06-13 13:03:32 +01:00
modmuss50
3829e83459
Fixes #1131 2017-06-13 12:48:31 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
c3c0a0421d
Lower generator output 2017-06-12 21:02:22 +01:00
modmuss50
2df2a1d1ba
Remove old config system 2017-06-12 20:51:36 +01:00
modmuss50
fed253332b
Move ore config, and use normal gson 2017-06-12 20:44:10 +01:00
modmuss50
50bb4ea7a9
More configs! 2017-06-12 20:38:43 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
modmuss50
0cf3e43992
Update to support RC changes 2017-06-12 20:06:15 +01:00
Prospector
f3726fd174 Update cable item textures 2017-06-12 10:40:35 -07:00
Prospector
11527b3a22 Fix cable models 2017-06-12 10:25:29 -07:00
modmuss50
e0c39a4777
Fix Creative tab issue 2017-06-12 17:30:21 +01:00
modmuss50
7426d83900
Remove broken VeinGenerator 2017-06-12 14:40:30 +01:00
modmuss50
cf5ed6afa0
Remove stupid/unused configs 2017-06-12 14:39:06 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
fc4d8686b8
Support RC changes 2017-06-12 14:19:16 +01:00
modmuss50
e0f63fd0c5
Try and fix cable inv rendering 2017-06-12 11:17:57 +01:00
modmuss50
624d8fb93a
Remove old cables 2017-06-12 10:55:26 +01:00
modmuss50
007e8714fa
Improvements to cables. 2017-06-12 10:47:38 +01:00
modmuss50
7a8a152911
Fix GUI's having a floating button 2017-06-12 10:28:57 +01:00