Automatically merged delta branch to master.
This commit is contained in:
		@@ -44,16 +44,16 @@ components:
 | 
			
		||||
    sendhealth: true
 | 
			
		||||
    sendposition: true
 | 
			
		||||
    allowwebchat: true
 | 
			
		||||
    webchat-interval: 5
 | 
			
		||||
    hidewebchatip: false
 | 
			
		||||
    webchat-interval: 2
 | 
			
		||||
    hidewebchatip: true
 | 
			
		||||
    trustclientname: false
 | 
			
		||||
    includehiddenplayers: false
 | 
			
		||||
    # (optional) if true, color codes in player display names are used
 | 
			
		||||
    use-name-colors: false
 | 
			
		||||
    use-name-colors: true
 | 
			
		||||
    # (optional) if true, player login IDs will be used for web chat when their IPs match
 | 
			
		||||
    use-player-login-ip: true
 | 
			
		||||
    # (optional) if use-player-login-ip is true, setting this to true will cause chat messages not matching a known player IP to be ignored
 | 
			
		||||
    require-player-login-ip: false
 | 
			
		||||
    require-player-login-ip: true
 | 
			
		||||
    # (optional) block player login IDs that are banned from chatting
 | 
			
		||||
    block-banned-player-chat: true
 | 
			
		||||
    # Require login for web-to-server chat (requires login-enabled: true)
 | 
			
		||||
@@ -241,7 +241,7 @@ tileupdatedelay: 30
 | 
			
		||||
enabletilehash: true
 | 
			
		||||
 | 
			
		||||
# Optional - hide ores: render as normal stone (so that they aren't revealed by maps)
 | 
			
		||||
#hideores: true
 | 
			
		||||
hideores: true
 | 
			
		||||
 | 
			
		||||
# Optional - enabled BetterGrass style rendering of grass and snow block sides
 | 
			
		||||
#better-grass: true
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
env.VER_MAJOR=0
 | 
			
		||||
env.VER_MINOR=0
 | 
			
		||||
env.VER_PATCH=11
 | 
			
		||||
env.VER_PATCH=12
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user