Merge commit 'b017c473e86330d5908858b8add1b16674b0a1a8' into garux-merge

diff --cc radiant/entity.cpp
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/patchmanip.cpp
index 2fbc322c68124249665e21b7ab30ed3d15b8d665,7ca446c1f3aeb4ee870daab125b28670bf8714e1..ca984ef6601089c00ceeb357bb58fde0df56c64a
--- 1/radiant/patchmanip.cpp
--- 2/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@@ -664,6 -720,9 +664,8 @@@ void Patch_Thicken()
  
        DoPatchThickenDlg();
  }
 -
+ 
+ 
  #include "ifilter.h"
  
  
@@@ -819,14 -874,14 +821,14 @@@ void Patch_constructMenu( ui::Menu men
                if ( g_Layout_enableDetachableMenus.m_value ) {
                        menu_tearoff( menu_in_menu );
                }
-               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Columns", "PatchInsertInsertColumn" );
                create_menu_item_with_mnemonic( menu_in_menu, "Add (2) Columns", "PatchInsertAddColumn" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Columns", "PatchInsertInsertColumn" );
                menu_separator( menu_in_menu );
-               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Rows", "PatchInsertInsertRow" );
                create_menu_item_with_mnemonic( menu_in_menu, "Add (2) Rows", "PatchInsertAddRow" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Rows", "PatchInsertInsertRow" );
        }
        {
 -              GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic( menu, "Delete" );
 +              auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Delete" );
                if ( g_Layout_enableDetachableMenus.m_value ) {
                        menu_tearoff( menu_in_menu );
                }

diff --cc radiant/patchmanip.h
index 512a3f95c1132c05cd28f08f9c8d7930f3466e9a,d6d8764cb65389f41ea4337a29a9568800d35d8a..773ceb965b9fb2a6f90e24879f150eb45f5414b0
--- 1/radiant/patchmanip.h
--- 2/radiant/patchmanip.h
+++ b/radiant/patchmanip.h
@@@ -50,14 -51,13 +50,21 @@@ void PatchPreferences_construct()
  
  void Patch_registerPreferencesPage();
  
 +void Patch_NaturalTexture();
 +void Patch_CapTexture();
 +void Patch_ResetTexture();
 +void Patch_FitTexture();
 +void Patch_FlipTextureX();
 +void Patch_FlipTextureY();
 +void Patch_AutoCapTexture();
 +
+ void Patch_NaturalTexture();
+ void Patch_CapTexture();
+ void Patch_ResetTexture();
+ void Patch_FitTexture();
+ void Patch_FlipTextureX();
+ void Patch_FlipTextureY();
+ 
  class PatchCreator;
  extern PatchCreator* g_patchCreator;
  

diff --cc radiant/texwindow.cpp
Simple merge

diff --cc setup/data/tools/global.xlink
index 4b6d0343f124f42a2b7ec31e315865a1f3b84ce7,1e16121fba4661c1efa092774f9d94c998ea9966..9bf44a651193b9f391af40bb7156e0dca2e181b2
--- 1/setup/data/tools/global.xlink
--- 2/setup/data/tools/global.xlink
+++ b/setup/data/tools/global.xlink
@@@ -1,7 -1,17 +1,8 @@@
  <?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
  <!-- generated by Radiant setup, modify at your own risks -->
  <links>
 -<!--item name="NetRadiant website" url="http://www.icculus.org/netradiant/"/-->
 -<item name="q3map2 handbook (web)" url="http://en.wikibooks.org/wiki/Category:Q3Map2"/>
 -<item name="Shader Manual (web)" url="http://robotrenegade.com/q3map2/docs/shader_manual/contents.html"/>
 -<item name="Shader Manual (offline+fixed)" url="docs/shaderManual/contents.html"/>
 -<item name="Mouse Shortcuts" url="docs/Mouse Shortcuts.txt"/>
 -<item name="Additional map compiler features" url="docs/Additional_map_compiler_features.htm"/>
 -<item name="Additional map editor features" url="docs/Additional_map_editor_features.htm"/>
 -<item name="Complete list of command line parameters" url="docs/Complete_list_of_command_line_parameters.htm"/>
 -<item name="Complete list of entity keys" url="docs/Complete_list_of_entity_keys.htm"/>
 -<item name="Complete list of shader keywords" url="docs/Complete_list_of_shader_keywords.htm"/>
 -<item name="Q3Map2 - FS20 - R5 readme" url="docs/fsr_readme.txt"/>
 +<item name="NetRadiant website" url="https://gitlab.com/xonotic/netradiant"/>
 +<item name="q3map2 handbook" url="http://q3map2.everyonelookbusy.net/shader_manual/"/>
 +<item name="q3map2 wikibook" url="https://en.wikibooks.org/wiki/Q3Map2"/>
+ <item name="Blendmodes cheatsheet" url="docs/Blendmodes_cheatsheet.jpg"/>
 -<!--item name="ETB documentation (web)" url="http://www.map-craft.com/modules.php?name=ETB"/-->
  </links>