Merge branch 'master' into master

[dragonfireclient.git] / builtin / settingtypes.txt

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index db0b1aa24ec222db5a52b5d120e89ffc67a28c94..620e4b3559f9a4452444d00d99f8f4d52e8ad2ec 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -270,21 +270,13 @@ keymap_drop (Drop item key) key KEY_KEY_Q
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 keymap_zoom (View zoom key) key KEY_KEY_Z
 
-#    Key for toggling X-Ray.
-#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_toggle_xray (Xray key) key KEY_KEY_X
-
-#    Key for toggling Fullbright.
-#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_toggle_fullbright (Fullbright key) key KEY_KEY_F
-
 #    Key for toggling Killaura.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_toggle_killaura (Killaura key) key KEY_KEY_G
+keymap_toggle_killaura (Killaura key) key KEY_KEY_X
 
 #    Key for toggling Freecam.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_toggle_freecam (Freecam key) key KEY_KEY_L
+keymap_toggle_freecam (Freecam key) key KEY_KEY_G
 
 #    Key for selecting the first hotbar slot.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
@@ -2221,21 +2213,49 @@ contentdb_url (ContentDB URL) string https://content.minetest.net
 #    so see a full list at https://content.minetest.net/help/content_flags/
 contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default
 
+[Cheat Menu]
+
+#   Font to use for cheat menu
+cheat_menu_font (MenuFont) enum FM_Standard, FM_Mono, FM_Fallback, FM_Simple, FM_SimpleMono, FM_MaxMode, FM_Unspecified
+
+#   (RGB value)
+m_bg_color (Cell background color) v3f 45 45 68
+
+m_bg_color_alpha (Cell background color alpha) int 173
+
+#   (RGB value)
+m_active_bg_color (Active cell background color) v3f 0 0 0
+
+m_active_bg_color_alpha (Active cell background color alpha) int 210
+
+#   (RGB value)
+m_font_color (Font color) v3f 255 255 255
+
+m_font_color_alpha (Font color alpha) int 195 
+
+#   (RGB value)
+m_selected_font_color (Selected font color) v3f 255 255 255
+
+m_selected_font_color_alpha (Selected font color alpha) int 235
+
 [Cheats]
 
 fullbright (Fullbright) bool false
 
-# Enable xray, requires fullbright
-xray (X-Ray) bool false
+xray (XRay) bool false
 
-# Texture to apply xray
-xray_node (X-RayTexture) string default:stone
+xray_nodes (XRay Nodes) string default:stone,mcl_core:stone
 
-# Make the Client think it has all privs
 priv_bypass (PrivBypass) bool true
 
 fastdig (FastDig) bool false
 
+fastplace (FastPlace) bool false
+
+autodig (AutoDig) bool false
+
+autoplace (AutoPlace) bool false
+
 prevent_natural_damage (NoFallDamage) bool true
 
 freecam (Freecam) bool false
@@ -2244,16 +2264,84 @@ killaura (Killaura) bool false
 
 no_hurt_cam (NoHurtCam) bool false
 
-increase_tool_range (Range) bool true
+increase_tool_range (IncreasedRange) bool true
+
+increase_tool_range_plus (IncreasedRangePlus) bool true
 
-# HUD Flags Bypass
 hud_flags_bypass (HUDBypass) bool true
 
 antiknockback (AntiKnockback) bool false
 
-# Set to true if AntiCheat is enabled on server
-anticheat_protection (AnticheatProtection) bool true
+entity_speed (GodMode) bool false
+
+jesus (Jesus) bool false
+
+instant_break (InstantBreak) bool false
+
+no_night (BrightNight) bool false
+
+coords (Coords) bool false
+
+point_liquids (PointLiquids) bool false
+
+log_particles (ParticleExploit) bool false
+
+spamclick (FastHit) bool false
+
+no_force_rotate (NoForceRotate) bool false
+
+enable_tracers (Tracers) bool false
+
+enable_esp (ESP) bool false
+
+no_slow (NoSlow) bool false
+
+ignore_status_messages (IgnoreStatus) bool true
+
+mark_deathmessages (Deathmessages) bool true
+
+autosneak (AutoSneak) bool false
+
+autoeject (AutoEject) bool false
+
+eject_items (AutoEject Items) string
+
+autotool (AutoTool) bool false
 
 autorespawn (AutoRespawn) bool false
 
-show_cheat_hud (CheatHUD) bool true
+next_item (NextItem) bool false
+
+scaffold (Scaffold) bool false
+
+scaffold_plus (ScaffoldPlus) bool false
+
+block_water (BlockWater) bool false
+
+autotnt (PlaceOnTop) bool false
+
+replace (Replace) bool false
+
+crystal_pvp (CrystalPvP) bool false
+
+autototem (AutoTotem) bool false
+
+dont_point_nodes (ThroughWalls) bool false
+
+strip (Strip) bool false
+
+autorefill (AutoRefill) bool false
+
+nuke (Nuke) bool false
+
+chat_color (Chat Color) string rainbow
+
+use_chat_color (ColoredChat) bool false
+
+chat_reverse (ReversedChat) bool false
+
+forcefield (Forcefield) bool false
+
+friendlist (Killaura / Forcefield Friendlist) string
+
+cheat_hud (CheatHUD) bool true
\ No newline at end of file