Commit graph

5420 commits

Author SHA1 Message Date
modmuss50
1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 2020-01-15 12:07:52 +00:00
drcrazy
a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 2020-01-14 02:22:06 +03:00
drcrazy
2aa2f6d7bb Adjusted recipes for storage units. Closes #1979 2020-01-13 21:42:46 +03:00
drcrazy
e16e5e3d1d Adjusted recipes for storage units. 2020-01-13 21:20:26 +03:00
drcrazy
357efe21aa Recipes for fluid tanks upgrades to next tier. Closes #1953 2020-01-13 18:04:52 +03:00
drcrazy
70789d3ce0 Sweet berries and kelp got their methane and plantball recipes. Closes #1977 2020-01-13 16:19:54 +03:00
drcrazy
728d4affbe Sweet berries centrifuge recipe. Some work on #1977 2020-01-13 15:55:26 +03:00
drcrazy
342043dbba Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
drcrazy
b9c8a1a215 Slight cleanup. Energy packs uses transfer rates from tier. 2020-01-13 13:53:36 +03:00
Prospector
04a1c789c4 Seriously clean up loads of unnecessary item classes and add more configs 2020-01-12 21:20:42 -08:00
Prospector
c4dcc8d870 Move a couple advanced unit recipes in the wrong spot 2020-01-12 19:29:37 -08:00
Prospector
960b064b5a Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00
Prospector
bcc9368bf9 Minor fix to enchanted golden apple's centrifuge recipe 2020-01-12 18:37:39 -08:00
modmuss50
7e6f0d1906 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-12 18:40:30 +00:00
modmuss50
bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model 2020-01-12 18:40:21 +00:00
Justin Vitale
0ff1e2b73e (Spearkiller) Properly capitalize advancement titles 2020-01-12 18:28:31 +11:00
Justin Vitale
f2138e034f Fix for fix #1971- Accounted for <= 64 stacks thus not in stored stack 2020-01-12 09:18:48 +11:00
drcrazy
eb9abe4c74 Sulfur dust got some usage. Closes #1945 2020-01-11 23:08:00 +03:00
modmuss50
3b4d135fd4 Fix #1971 2020-01-11 13:29:22 +00:00
modmuss50
c1097a5cd8 Get the light from infront of the storage unit 2020-01-11 13:18:21 +00:00
Justin Vitale
d728cd70d8
Merge pull request #1972 from vhd/bugfix/reinforced-glass-rendering
Fix reinforced glass rendering
2020-01-11 22:15:51 +11:00
vhd
9dc063e153 Fix reinforced glass rendering 2020-01-11 11:49:22 +02:00
modmuss50
7247b60274 #releaseBuild 2020-01-10 23:34:47 +00:00
vhd
e4bc2a0cb7 Powered items should be indestructible now (#1970) 2020-01-10 21:49:14 +00:00
vhd
f1731fe925 Slightly better REI fluid handling. (#1968)
- now you can jump between fluid/cells/buckets when looking for recipes
2020-01-10 21:05:05 +00:00
vhd
9e1b1a76e1 Added config for machines crafting sound (#1969) 2020-01-10 21:03:58 +00:00
modmuss50
bc47a03451 Keep energy in items when crafting 2020-01-10 17:33:20 +00:00
vhd
d1b395f3e4 Cables can now be covered. Thanks to vhd. Closes #1954 2020-01-10 18:07:02 +03:00
drcrazy
a115fbd736 Dispenser can use cells. Closes #1948 2020-01-10 16:09:03 +03:00
drcrazy
8db5cea07c Refactoring for Scrapbox Dispenser behaviour. 2020-01-10 04:01:53 +03:00
drcrazy
3f2f186b56 Buff ruby dust to chrome dust recipe. Closes #1955 2020-01-10 01:55:12 +03:00
drcrazy
985bef6dae Superconductor cable now craftable. Closes #1962 2020-01-09 17:45:12 +03:00
drcrazy
88c0aca954 Fix fusion reactor power gen. Closes #1961 2020-01-09 16:33:32 +03:00
vhd
5e3341df21 Fix more UU-matter recipes. Kudos to vhd. Closes #1959 2020-01-09 14:16:24 +03:00
drcrazy
39617f61c0 FIx some of UU-matter recipes in a hacky way 2020-01-09 13:43:40 +03:00
drcrazy
1d053bb592 Make electric tools enchantable on table. Closes #1944 2020-01-08 16:45:33 +03:00
drcrazy
0f56adbc9e Storage Units should render content being stored. 2020-01-07 23:25:48 +03:00
drcrazy
f36c0cd3c6 Fix tank fluid tooltip. Closes #1958 2020-01-05 17:40:52 +03:00
modmuss50
f61cec6506 Fix #1949 2020-01-05 11:44:59 +00:00
modmuss50
42afb3528c Fix #1957 and Fix #1951 2020-01-05 11:38:23 +00:00
modmuss50
1a851d1708
Update Jenkinsfile 2020-01-04 22:44:24 +00:00
drcrazy
525f956e0d BUff Industrial Jackhammer. Some work on #1944 2020-01-04 23:31:58 +03:00
Justin Vitale
5d89272a10 Add WIP textured drain block without logic 2020-01-04 16:18:34 +11:00
Justin Vitale
a98eff45af Removed magic energy converter and absorber (Revert to undo)
Associated translations and textures also removed
2020-01-04 14:29:11 +11:00
Justin Vitale
9aeddd204a WIP tag to interface, capacity spacing fix, removed Supercondensator
Sidenote: Also renamed DocumentAssistUtils to ToolTipAssistUtils.
2020-01-04 14:20:57 +11:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
modmuss50
e3d13fae6f #releaseBuild 2020-01-03 22:30:30 +00:00
drcrazy
f5360f8416 Fix tooltip for energy storage. 2020-01-03 17:20:50 +03:00
drcrazy
55e56c3962 Added leather recipe for chemical reactor. 2020-01-03 15:56:13 +03:00
drcrazy
d127e43fee Change iridium from ingot to plate in Iridium alloy plate recipe. 2020-01-03 15:29:19 +03:00