Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-09-12 12:47:29 -04:00
4 changed files with 5 additions and 2 deletions
+2
View File
@@ -195,6 +195,8 @@ public class Block extends UnlockableContent{
public float buildCostMultiplier = 1f;
/** Whether this block has instant transfer.*/
public boolean instantTransfer = false;
/** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */
public boolean quickRotate = true;
public Prov<Building> buildType = null; //initialized later
public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();