Merge branch 'master' into dev

nikigawlik · Feb 18, 2022 · db23ba4 · db23ba4
2 parents f24d95e + 0cc0e65
commit db23ba4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gdpc/lookup.py b/gdpc/lookup.py
@@ -572,7 +572,7 @@
  'minecraft:jack_o_lantern', 'minecraft:sea_lantern',
  'minecraft:glowstone')
 
-LIGHTSOURCES = FIRES + CAMPFIRES + TORCHES + LANTERNS + LIGHTBLOCK
+LIGHTSOURCES = FIRES + CAMPFIRES + TORCHES + LANTERNS + LIGHTBLOCKS
 
 # mechanical
 WIRING = ('minecraft:redstone_wire',
@@ -709,7 +709,7 @@
  'minecraft:lily_pad',
  'minecraft:scaffolding',
  'minecraft:snow') \
- + GLASS + RAILS + WIRING + BUTTONS + TORCHES + SIGNS
+ + GLASS + RAILS + WIRING + SWITCHES + TORCHES + SIGNS
 
 # can be seen through moderately
 OBTRUSIVE = ('minecraft:bell', 'minecraft:brewing_stand', 'minecraft:cake',
@@ -737,7 +737,7 @@
  'minecraft:nether_portal',
  'minecraft:iron_bars',
  'minecraft:chain') \
- + INVISIBLE + WIRING + RAILS + BUTTONS + HEADS + TORCHES
+ + INVISIBLE + WIRING + RAILS + SWITCHES + HEADS + TORCHES
 
 # base map colours
 # WARNING: all non-transparent blocks are listed individually here again