Commit graph

4221 commits

Author SHA1 Message Date
modmuss50
b560a5483d Dont allow recycling of upgrades 2019-03-06 14:41:06 +00:00
modmuss50
b62b8cc248 Fix #1678 2019-03-06 14:34:16 +00:00
drcrazy
4650f3e375 Moved remainings of postInit to loadComplete 2019-03-06 17:34:10 +03:00
modmuss50
8b2c098b27 Add some bad code to stop the creative solar panel from exploding when FE is disabled. 2019-03-06 14:29:22 +00:00
modmuss50
e7715937cf Increase the AESU max power to 16192 2019-03-06 14:28:50 +00:00
modmuss50
3ca9347212 Update Auto crafting table to use the better code from the rolling machine, should fix some issues. 2019-03-06 14:06:02 +00:00
modmuss50
89bcf61717 Merge remote-tracking branch 'origin/1.13' into 1.13 2019-03-05 14:28:54 +00:00
modmuss50
f9efc72c99 Update forge 2019-03-05 14:28:42 +00:00
drcrazy
d29eb5706d Storage blocks got their textures 2019-03-05 17:27:28 +03:00
drcrazy
a4d9401040 At least block models could be in subfolders 2019-03-04 18:14:41 +03:00
drcrazy
d6d0515a1b Blockstate+models for ores 2019-03-04 17:37:01 +03:00
drcrazy
f64229efb4 Fix tags 2019-03-04 12:34:23 +03:00
modmuss50
38eca7b3e8 Fix lang 2019-03-02 18:57:58 +00:00
modmuss50
ff1370a3fd Fix opening guis, still needs some work, but atleast it works now 2019-03-02 18:45:33 +00:00
drcrazy
f94d6630fb More scrapbox recipes and less spam 2019-03-02 03:36:04 +03:00
modmuss50
046fcba860 Idea pass on model generation 2019-03-01 21:42:56 +00:00
modmuss50
001dd9ac74 Basic work on the genResources task 2019-03-01 21:24:26 +00:00
drcrazy
97b517580a Fixed license 2019-03-01 18:59:11 +03:00
drcrazy
f6579f5c2c Rubber Plank stairs got textures 2019-03-01 17:29:19 +03:00
drcrazy
f6d94647e2 Rendering for grinder 2019-03-01 15:36:04 +03:00
drcrazy
3ce99b987f TE should register now 2019-03-01 14:28:32 +03:00
drcrazy
0666ade222 Fixed typo 2019-02-28 18:04:11 +03:00
drcrazy
59b0633353 Added ArmorMaterials 2019-02-27 17:58:00 +03:00
drcrazy
eb51e07998 ToolTier values migrated in a dirty way 2019-02-26 15:39:10 +03:00
drcrazy
927d3637a5 FIxed couple of warnings 2019-02-26 14:47:13 +03:00
drcrazy
a979ff747f Nuke is back 2019-02-26 14:28:08 +03:00
modmuss50
c1343cdc26 #releaseBuild 2019-02-25 17:28:15 +00:00
modmuss50
5397b26cf2 Machine cases drop them selves to fix https://github.com/FTBTeam/FTB-Ultimate-Reloaded/issues/90 2019-02-25 17:25:06 +00:00
drcrazy
ba220246f0 Dispenser should dispense scrapboxes again 2019-02-25 15:37:03 +03:00
drcrazy
767ce10bf1 Revert wrong changes 2019-02-25 11:51:57 +03:00
drcrazy
3314ba33b5 Fixed warnings 2019-02-25 11:43:43 +03:00
modmuss50
4d32e6e292 Horrible quick port of gui handling, tiles still need fixing first tho 2019-02-24 00:13:27 +00:00
modmuss50
db3a6f2c7e Enough to get the game running 2019-02-23 23:51:37 +00:00
modmuss50
b8f09d29b7 Add mods.toml 2019-02-23 19:33:13 +00:00
modmuss50
d7c4f55e6c Auto format imports 2019-02-23 19:14:30 +00:00
modmuss50
1c783abf9d Item fixes, it compiles :D 2019-02-23 19:13:57 +00:00
modmuss50
7a441cea77 Taking a break now, 63 2019-02-22 15:11:38 +00:00
modmuss50
fd0fa8c66e Bunch of item work, 96 2019-02-22 15:02:41 +00:00
modmuss50
91994e5a01 229 - comment out all recipes as we can deal with these later + start thinking more about tags 2019-02-22 14:27:22 +00:00
drcrazy
ab2ce91e39 MOre rubber stuff. ONly sapling left to do 2019-02-22 17:25:31 +03:00
drcrazy
b6494ecbf6 Merge with HEAD 2019-02-22 17:19:38 +03:00
modmuss50
a5b2adac78 More minor fixes, 370 2019-02-22 14:11:55 +00:00
modmuss50
d68c65641d Gui fixes, 393 2019-02-22 14:02:04 +00:00
drcrazy
06632be822 One more block done. Just a few left 2019-02-22 16:14:46 +03:00
drcrazy
647b126c98 Updated mappings 2019-02-22 14:36:13 +03:00
modmuss50
b864d551dd Update mappings + more tile work 2019-02-22 10:29:11 +00:00
drcrazy
63fe6d2ef4 Some luv to rubber stuff ) 2019-02-22 13:22:07 +03:00
modmuss50
6f9baaeb30 Crafting manager fixes 2019-02-22 09:47:07 +00:00
drcrazy
a003656419 GUI fixes 2019-02-22 11:51:55 +03:00
modmuss50
f78b16293f Merge remote-tracking branch 'origin/1.13' into 1.13 2019-02-21 23:07:51 +00:00