Merge branch 'stable-1.0' into stable-1.1
This commit is contained in:
		
							
								
								
									
										7
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -406,23 +406,18 @@
 | 
			
		||||
[submodule "irc"]
 | 
			
		||||
	path = irc
 | 
			
		||||
	url = https://sys4.fr/gitea/nalc/irc.git
 | 
			
		||||
	branch = nalc
 | 
			
		||||
[submodule "3d_armor"]
 | 
			
		||||
	path = 3d_armor
 | 
			
		||||
	url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git
 | 
			
		||||
	branch = nalc-1.0
 | 
			
		||||
[submodule "3d_armor_classes"]
 | 
			
		||||
	path = 3d_armor_classes
 | 
			
		||||
	url = https://sys4.fr/gitea/nalc/3d_armor_classes.git
 | 
			
		||||
[submodule "WorldEdit"]
 | 
			
		||||
	path = WorldEdit
 | 
			
		||||
	url = https://sys4.fr/gitea/nalc/Minetest-WorldEdit.git
 | 
			
		||||
	branch = nalc
 | 
			
		||||
	url = https://sys4.fr/gitea/mtcontrib/Minetest-WorldEdit.git
 | 
			
		||||
[submodule "action_timers"]
 | 
			
		||||
	path = action_timers
 | 
			
		||||
	url = https://sys4.fr/gitea/mff/action_timers.git
 | 
			
		||||
	branch = master
 | 
			
		||||
[submodule "areas"]
 | 
			
		||||
	path = areas
 | 
			
		||||
	url = https://sys4.fr/gitea/nalc/areas.git
 | 
			
		||||
	branch = nalc
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user