Commit graph

4531 commits

Author SHA1 Message Date
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
modmuss50
18b3535607 More fixes 637 2019-02-21 23:07:44 +00:00
drcrazy
ec919415fb Update strings to textcomponent 2019-02-22 02:00:57 +03:00
modmuss50
f51222ac3e Remove some old stuff 2019-02-21 22:54:09 +00:00
modmuss50
61b6d30262 Bunch of tile work 752 2019-02-21 22:46:26 +00:00
drcrazy
1ab52f40c2 FIxed import for EventPriority 2019-02-22 01:20:54 +03:00
drcrazy
e3be87d517 MOre fixes for items. Down to 860 2019-02-22 01:13:30 +03:00
drcrazy
e513e20e5a Migrated batteries + TR Itemgroup 2019-02-22 00:22:43 +03:00
modmuss50
0c99a94250 Update packets to new format, 930 errors 2019-02-21 18:29:04 +00:00
modmuss50
f6a79ce579 Some random fixes, 959 errors 2019-02-21 18:11:55 +00:00
modmuss50
0975b4353b Nuke the dev command as it will need rewriting 2019-02-21 17:56:04 +00:00
modmuss50
a93361792f fix ConfigRegistry location, 1118 errors 2019-02-21 17:55:17 +00:00
modmuss50
02d2d9cf1c Start work on porting tool and armor materials, values still need porting over 2019-02-21 17:53:30 +00:00
drcrazy
0b0435a1a2 MOre work on blocks. Less then 1200 errors left 2019-02-21 18:21:40 +03:00
drcrazy
93cf0a97d5 Tier 0, 2, 3 machine blocks fixed 2019-02-21 16:27:18 +03:00
drcrazy
3201ac878b Energy Storage migrated 2019-02-21 16:00:12 +03:00
drcrazy
46fb0ede7a Some migration for Nuke 2019-02-21 14:11:59 +03:00
drcrazy
bd00135137 Migrated getDrops 2019-02-21 13:54:49 +03:00
drcrazy
bdb8834a3e Updated onBlockActivated 2019-02-21 13:35:54 +03:00
drcrazy
8489259672 Recipes migrated for ChemReactor and Rolling Machine 2019-02-21 13:08:16 +03:00
drcrazy
5c7c29f34d Updated @RebornRegister annotation usage 2019-02-21 12:48:35 +03:00
drcrazy
860068b27a Flora based extractor recipes 2019-02-21 12:23:07 +03:00
drcrazy
398cb9617d Removed unused import 2019-02-21 02:43:27 +03:00
drcrazy
1567920c8e Updated addInformation method for blocks and items 2019-02-21 01:53:33 +03:00
drcrazy
6be1fbc4e9 Updated createNewTileEntity method 2019-02-21 00:19:11 +03:00
modmuss50
df8c2cd34b 1.13.2 2019-02-20 20:27:03 +00:00
drcrazy
5bc08557b3 Migration work on TR armor 2019-02-20 23:12:36 +03:00
modmuss50
b9992292b2 Merge remote-tracking branch 'origin/1.12' into 1.12 2019-02-20 19:39:46 +00:00
modmuss50
e03734e66d Fix #1669 2019-02-20 19:39:23 +00:00
modmuss50
0086d88e1d #releaseBuild 2019-02-17 19:00:30 +00:00
modmuss50
4aae2422fa Fix LED lights not using correct cables 2019-02-15 19:12:11 +00:00
modmuss50
65b95afed8 After complaints that the manual is a scam, you can now refund it back into its ingredients.
Can be disabled in config
2019-02-15 18:33:45 +00:00
drcrazy
8b82259871 Iron and gold armor recycling in blast furnace. 2019-02-15 14:19:48 +03:00
modmuss50
4addff892b Create a WrenchContext to allow for ic2 mod compat to register support for using ic2's wrench 2019-02-14 15:58:33 +00:00
drcrazy
8e34062f6e Iron alloy smelter should consume right amount of inputs. Closes #1667 2019-02-13 14:56:49 +03:00
drcrazy
fbcab3bf2d DRY for IronAlloySmelter fuel burn time 2019-02-13 11:21:21 +03:00
modmuss50
008358b39c #releaseBuild 2019-02-11 23:50:48 +00:00
drcrazy
3fb799e544 Removed unused imports 2019-02-11 15:35:37 +03:00
drcrazy
0fa72c4fc3 More efficient diamond grinding and armor recycling 2019-02-11 15:32:24 +03:00
modmuss50
3610535169 #releaseBuild 2019-02-07 21:26:37 +00:00
modmuss50
b9169c5397 Merge remote-tracking branch 'origin/1.12' into 1.12 2019-02-07 20:26:52 +00:00