1 files changed, 41 insertions, 39 deletions
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 95a61fc28..f124cd7a5 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -2,30 +2,30 @@ src/activeobject.h
 src/ban.cpp
 src/camera.cpp
 src/camera.h
-src/mapgen/cavegen.cpp
-src/mapgen/cavegen.h
 src/chat.cpp
 src/chat.h
 src/chat_interface.h
+src/client/clientlauncher.cpp
+src/client/clientlauncher.h
 src/client.cpp
-src/client.h
 src/clientenvironment.cpp
 src/clientenvironment.h
+src/client/gameui.cpp
+src/client.h
+src/client/hud.cpp
+src/client/hud.h
 src/clientiface.cpp
 src/clientiface.h
+src/client/joystick_controller.cpp
+src/client/joystick_controller.h
 src/clientmap.cpp
 src/clientmap.h
 src/clientmedia.cpp
 src/clientmedia.h
 src/clientobject.cpp
 src/clientobject.h
-src/client/clientlauncher.cpp
-src/client/clientlauncher.h
-src/client/gameui.cpp
-src/client/joystick_controller.cpp
-src/client/joystick_controller.h
-src/client/renderingengine.cpp
 src/client/render/core.cpp
+src/client/renderingengine.cpp
 src/client/render/interlaced.cpp
 src/client/render/plain.cpp
 src/client/render/sidebyside.cpp
@@ -65,8 +65,6 @@ src/daynightratio.h
 src/debug.cpp
 src/debug.h
 src/defaultsettings.cpp
-src/mapgen/dungeongen.cpp
-src/mapgen/dungeongen.h
 src/emerge.cpp
 src/emerge.h
 src/environment.cpp
@@ -81,8 +79,8 @@ src/filesys.h
 src/fontengine.cpp
 src/fontengine.h
 src/game.cpp
-src/game.h
 src/gamedef.h
+src/game.h
 src/genericobject.cpp
 src/genericobject.h
 src/gettext.cpp
@@ -93,26 +91,29 @@ src/gui/guiEditBoxWithScrollbar.cpp
 src/gui/guiEditBoxWithScrollbar.h
 src/gui/guiEngine.cpp
 src/gui/guiEngine.h
-src/gui/guiPathSelectMenu.cpp
-src/gui/guiPathSelectMenu.h
 src/gui/guiFormSpecMenu.cpp
 src/gui/guiFormSpecMenu.h
 src/gui/guiKeyChangeMenu.cpp
 src/gui/guiMainMenu.h
 src/gui/guiPasswordChange.cpp
-src/guiscalingfilter.cpp
-src/guiscalingfilter.h
+src/gui/guiPathSelectMenu.cpp
+src/gui/guiPathSelectMenu.h
 src/gui/guiTable.cpp
 src/gui/guiTable.h
 src/gui/guiVolumeChange.cpp
 src/gui/guiVolumeChange.h
+src/gui/intlGUIEditBox.cpp
+src/gui/intlGUIEditBox.h
+src/gui/mainmenumanager.h
+src/gui/modalMenu.h
+src/guiscalingfilter.cpp
+src/guiscalingfilter.h
+src/gui/touchscreengui.cpp
 src/httpfetch.cpp
 src/hud.cpp
 src/hud.h
 src/imagefilters.cpp
 src/imagefilters.h
-src/gui/intlGUIEditBox.cpp
-src/gui/intlGUIEditBox.h
 src/inventory.cpp
 src/inventory.h
 src/inventorymanager.cpp
@@ -132,21 +133,23 @@ src/localplayer.cpp
 src/log.cpp
 src/log.h
 src/main.cpp
-src/gui/mainmenumanager.h
 src/mapblock.cpp
 src/mapblock.h
 src/mapblock_mesh.cpp
 src/mapblock_mesh.h
 src/map.cpp
-src/map.h
-src/mapgen/mapgen.cpp
-src/mapgen/mapgen.h
+src/mapgen/cavegen.cpp
+src/mapgen/cavegen.h
+src/mapgen/dungeongen.cpp
+src/mapgen/dungeongen.h
 src/mapgen/mapgen_carpathian.cpp
 src/mapgen/mapgen_carpathian.h
+src/mapgen/mapgen.cpp
 src/mapgen/mapgen_flat.cpp
 src/mapgen/mapgen_flat.h
 src/mapgen/mapgen_fractal.cpp
 src/mapgen/mapgen_fractal.h
+src/mapgen/mapgen.h
 src/mapgen/mapgen_singlenode.cpp
 src/mapgen/mapgen_singlenode.h
 src/mapgen/mapgen_v5.cpp
@@ -157,6 +160,17 @@ src/mapgen/mapgen_v7.cpp
 src/mapgen/mapgen_v7.h
 src/mapgen/mapgen_valleys.cpp
 src/mapgen/mapgen_valleys.h
+src/mapgen/mg_biome.cpp
+src/mapgen/mg_biome.h
+src/mapgen/mg_decoration.cpp
+src/mapgen/mg_decoration.h
+src/mapgen/mg_ore.cpp
+src/mapgen/mg_ore.h
+src/mapgen/mg_schematic.cpp
+src/mapgen/mg_schematic.h
+src/mapgen/treegen.cpp
+src/mapgen/treegen.h
+src/map.h
 src/mapnode.cpp
 src/mapnode.h
 src/mapsector.cpp
@@ -164,20 +178,11 @@ src/mapsector.h
 src/map_settings_manager.cpp
 src/map_settings_manager.h
 src/mesh.cpp
-src/mesh.h
 src/mesh_generator_thread.cpp
+src/mesh.h
 src/metadata.h
-src/mapgen/mg_biome.cpp
-src/mapgen/mg_biome.h
-src/mapgen/mg_decoration.cpp
-src/mapgen/mg_decoration.h
-src/mapgen/mg_ore.cpp
-src/mapgen/mg_ore.h
-src/mapgen/mg_schematic.cpp
-src/mapgen/mg_schematic.h
 src/minimap.cpp
 src/minimap.h
-src/gui/modalMenu.h
 src/mods.cpp
 src/mods.h
 src/network/clientopcodes.cpp
@@ -305,12 +310,12 @@ src/script/scripting_server.cpp
 src/script/scripting_server.h
 src/serialization.cpp
 src/serialization.h
-src/server.cpp
-src/server.h
 src/serveractiveobjectmap.cpp
 src/serveractiveobjectmap.h
+src/server.cpp
 src/serverenvironment.cpp
 src/serverenvironment.h
+src/server.h
 src/serverlist.cpp
 src/serverlist.h
 src/serverobject.cpp
@@ -342,17 +347,14 @@ src/threads.h
 src/tileanimation.cpp
 src/tool.cpp
 src/tool.h
-src/gui/touchscreengui.cpp
 src/translation.cpp
-src/mapgen/treegen.cpp
-src/mapgen/treegen.h
-src/unittest/test.cpp
-src/unittest/test.h
 src/unittest/test_areastore.cpp
 src/unittest/test_collision.cpp
 src/unittest/test_compression.cpp
 src/unittest/test_connection.cpp
+src/unittest/test.cpp
 src/unittest/test_filepath.cpp
+src/unittest/test.h
 src/unittest/test_inventory.cpp
 src/unittest/test_keycode.cpp
 src/unittest/test_map_settings_manager.cpp