Skip to content
This repository was archived by the owner on Nov 20, 2017. It is now read-only.

Commit 97159a6

Browse files
author
jadar
committed
Merge pull request #22 from Cortex-Modders/1.7.10-release
1.7.10 release
2 parents 3ca08fc + 24359ae commit 97159a6

184 files changed

Lines changed: 5475 additions & 3315 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
target/
33
build/
44
bin/
5+
run/
6+
.idea/
7+
*.iml
58

69
# Other files and folders
710
.settings/

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ buildscript {
2020

2121
// apply plugin to this project
2222
apply plugin: 'forge'
23+
apply from: 'snapshot.gradle'
2324

2425
// minecraft properteis
2526
minecraft {
26-
version = "1.7.2-10.12.1.1095"
27+
version = "1.7.10-10.13.2.1232"
2728
}
2829

2930
//buildNumber is deprecated
@@ -34,7 +35,7 @@ if(System.getenv().TRAVIS_BUILD_NUMBER != null)
3435
}
3536

3637
// version and stuff
37-
version = "1.5.0.${buildnumber}"
38+
version = "1.6.0.0"
3839
group = "net.cortexmodders.lyoko"
3940
archivesBaseName = "CodeLyoko-forge"
4041

gradlew

100644100755
File mode changed.

gravatars.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
4+
#fetch Gravatars
5+
6+
import os
7+
import requests
8+
import subprocess
9+
import hashlib
10+
11+
12+
def md5_hex(text):
13+
m = hashlib.md5()
14+
m.update(text.encode('ascii', errors='ignore'))
15+
return m.hexdigest()
16+
17+
size = 90
18+
output_dir = os.path.join('.git', 'avatar')
19+
20+
os.makedirs(output_dir, exist_ok=True)
21+
22+
gitlog = subprocess.check_output(['git', 'log', '--pretty=format:%ae|%an'])
23+
authors = set(gitlog.decode('ascii', errors='ignore').splitlines())
24+
print(authors)
25+
for author in authors:
26+
email, name = author.split('|')
27+
output_file = os.path.join(output_dir, name + '.png')
28+
if not os.path.exists(output_file):
29+
grav_url = "http://www.gravatar.com/avatar/" + md5_hex(email) + "?d=identicon&s=" + str(size)
30+
print(email, name, grav_url)
31+
r = requests.get(grav_url)
32+
if r.ok:
33+
with open(output_file, 'wb') as img:
34+
img.write(r.content)

snapshot.gradle

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//takes *.csv files under the gradle dir and applies them to the current project
2+
//for details how to generate these files, check https://gist.github.com/xaeroverse/0c3736fc14fa168a7706
3+
4+
afterEvaluate {
5+
["forge", "fml", "liteloader"].each { fgPluginName ->
6+
if (project.plugins.hasPlugin(fgPluginName)) {
7+
def fgPlugin = project.plugins.findPlugin(fgPluginName)
8+
def mcpSnapshotsDir = fgPlugin.delayedString(project.getProjectDir().getPath() + "/conf/").call()
9+
def confDir = fgPlugin.delayedString("{USER_DEV}/conf/").call() // UserConstants.CONF_DIR
10+
11+
def suffix = fgPluginName[0].toUpperCase() + fgPluginName.substring(1)
12+
task("copyMcpSnapshot$suffix", type: Copy) {
13+
from mcpSnapshotsDir
14+
into confDir
15+
include '*.csv'
16+
}
17+
18+
tasks["copyMcpSnapshot$suffix"].mustRunAfter extractUserDev
19+
tasks.genSrgs.dependsOn tasks["copyMcpSnapshot$suffix"]
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)