# Conflicts:

#	core/src/mindustry/content/Blocks.java
This commit is contained in:
Anuken
2021-10-14 19:17:50 -04:00
parent 082edbff6f
commit ef399d349c
2 changed files with 6 additions and 6 deletions

View File

@@ -102,7 +102,7 @@ public class Blocks implements ContentList{
message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
//campaign
launchPad, payloadLaunchPad, interplanetaryAccelerator,
launchPad, interplanetaryAccelerator,
//nuclear?
nuclearWarhead, warheadAssembler, ballisticSilo //TODO