mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 03:03:43 +01:00 
			
		
		
		
	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared
This commit is contained in:
		@@ -7,16 +7,6 @@ dependencies {
 | 
				
			|||||||
    compile 'net.milkbowl.vault:VaultAPI:1.5'
 | 
					    compile 'net.milkbowl.vault:VaultAPI:1.5'
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
processResources {
 | 
					 | 
				
			||||||
    from('src/main/resources') {
 | 
					 | 
				
			||||||
        include 'plugin.yml'
 | 
					 | 
				
			||||||
        expand(
 | 
					 | 
				
			||||||
                name: project.parent.name,
 | 
					 | 
				
			||||||
                version: project.parent.version
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
shadowJar {
 | 
					shadowJar {
 | 
				
			||||||
    dependencies {
 | 
					    dependencies {
 | 
				
			||||||
        include(dependency(':Core'))
 | 
					        include(dependency(':Core'))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
name: $name
 | 
					name: PlotSquared
 | 
				
			||||||
main: com.plotsquared.bukkit.BukkitMain
 | 
					main: com.plotsquared.bukkit.BukkitMain
 | 
				
			||||||
version: $version
 | 
					version: 3.3.0
 | 
				
			||||||
load: STARTUP
 | 
					load: STARTUP
 | 
				
			||||||
description: >
 | 
					description: >
 | 
				
			||||||
             Easy, yet powerful Plot World generation and management.
 | 
					             Easy, yet powerful Plot World generation and management.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user