Skip to content

Commit 260be68

Browse files
committed
Update to 1.10
1 parent 3fbf8c9 commit 260be68

File tree

162 files changed

+1930
-1016
lines changed

Some content is hidden

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

162 files changed

+1930
-1016
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ apply plugin: "net.minecraftforge.gradle.patcher"
2626
apply plugin: "net.minecraftforge.gradle.launch4j"
2727

2828
minecraft {
29-
version = "1.9.4"
29+
version = "1.10"
3030
mappings = 'snapshot_nodoc_20160518'
3131
workspaceDir = "projects"
32-
versionJson = "jsons/1.9.4-dev.json"
32+
versionJson = "jsons/1.10-dev.json"
3333
buildUserdev = true
3434
buildInstaller = true
3535
installerVersion = "1.4"
@@ -66,7 +66,7 @@ extractForgeResources { exclude "**/log4j2.xml" }
6666
genGradleProjects { addTestCompileDep "junit:junit:4.12" }
6767

6868
processJson {
69-
releaseJson = "jsons/1.9.4-rel.json"
69+
releaseJson = "jsons/1.10-rel.json"
7070
addReplacements([
7171
"@minecraft_version@": project.minecraft.version,
7272
"@version@": project.version,

jsons/1.10-dev.json

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
{
2+
"id": "@minecraft_version@-@project@@version@",
3+
"time": "@timestamp@",
4+
"releaseTime": "1960-01-01T00:00:00-0700",
5+
"type": "release",
6+
"inheritsFrom": "1.10",
7+
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
8+
"libraries": [
9+
{
10+
"name": "net.minecraft:launchwrapper:1.12"
11+
},
12+
{
13+
"name": "jline:jline:2.13",
14+
"children": ["sources"],
15+
"url" : "http://repo.maven.apache.org/maven2"
16+
},
17+
{
18+
"name": "com.google.code.findbugs:jsr305:1.3.9",
19+
"children": ["sources"],
20+
"url" : "http://repo.maven.apache.org/maven2"
21+
},
22+
{
23+
"name": "org.ow2.asm:asm-debug-all:5.0.3",
24+
"children" : ["sources"],
25+
"url" : "http://repo.maven.apache.org/maven2"
26+
},
27+
{
28+
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
29+
"children" : ["sources"],
30+
"url" : "http://repo.maven.apache.org/maven2"
31+
},
32+
{
33+
"name": "com.typesafe:config:1.2.1",
34+
"children" : ["sources"],
35+
"url" : "http://repo.maven.apache.org/maven2"
36+
},
37+
{
38+
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
39+
"children" : ["sources"],
40+
"url" : "http://repo.maven.apache.org/maven2"
41+
},
42+
{
43+
"name": "org.scala-lang:scala-compiler:2.11.1",
44+
"children" : ["sources"],
45+
"url" : "http://repo.maven.apache.org/maven2"
46+
},
47+
{
48+
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
49+
"children" : ["sources"],
50+
"url" : "http://repo.maven.apache.org/maven2"
51+
},
52+
{
53+
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
54+
"children" : ["sources"],
55+
"url" : "http://repo.maven.apache.org/maven2"
56+
},
57+
{
58+
"name": "org.scala-lang:scala-library:2.11.1",
59+
"children" : ["sources"],
60+
"url" : "http://repo.maven.apache.org/maven2"
61+
},
62+
{
63+
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
64+
"children" : ["sources"],
65+
"url" : "http://repo.maven.apache.org/maven2"
66+
},
67+
{
68+
"name": "org.scala-lang:scala-reflect:2.11.1",
69+
"children" : ["sources"],
70+
"url" : "http://repo.maven.apache.org/maven2"
71+
},
72+
{
73+
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
74+
"children" : ["sources"],
75+
"url" : "http://repo.maven.apache.org/maven2"
76+
},
77+
{
78+
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
79+
"children" : ["sources"],
80+
"url" : "http://repo.maven.apache.org/maven2"
81+
},
82+
{
83+
"name": "lzma:lzma:0.0.1"
84+
},
85+
{
86+
"name": "java3d:vecmath:1.5.2"
87+
},
88+
{
89+
"name": "net.sf.trove4j:trove4j:3.0.3"
90+
}
91+
]
92+
}

jsons/1.10-rel.json

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
{
2+
"install": {
3+
"profileName": "@project@",
4+
"target":"@minecraft_version@-@project@@version@",
5+
"path":"@artifact@",
6+
"version":"@project@ @version@",
7+
"filePath":"@universal_jar@",
8+
"welcome":"Welcome to the simple @project@ installer.",
9+
"minecraft":"@minecraft_version@",
10+
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
11+
"logo":"/big_logo.png"
12+
},
13+
"versionInfo": {
14+
"id": "@minecraft_version@-@project@@version@",
15+
"time": "@timestamp@",
16+
"releaseTime": "1960-01-01T00:00:00-0700",
17+
"type": "release",
18+
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
19+
"mainClass": "net.minecraft.launchwrapper.Launch",
20+
"inheritsFrom": "1.10",
21+
"jar": "1.10",
22+
"libraries": [
23+
{
24+
"name": "@artifact@",
25+
"url": "http://files.minecraftforge.net/maven/"
26+
},
27+
{
28+
"name": "net.minecraft:launchwrapper:1.12",
29+
"serverreq":true
30+
},
31+
{
32+
"name": "org.ow2.asm:asm-all:5.0.3",
33+
"serverreq":true
34+
},
35+
{
36+
"name": "jline:jline:2.13",
37+
"url" : "http://files.minecraftforge.net/maven/",
38+
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
39+
"serverreq":true,
40+
"clientreq":false
41+
},
42+
{
43+
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
44+
"url" : "http://files.minecraftforge.net/maven/",
45+
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
46+
"serverreq":true,
47+
"clientreq":true
48+
},
49+
{
50+
"name": "com.typesafe:config:1.2.1",
51+
"url" : "http://files.minecraftforge.net/maven/",
52+
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
53+
"serverreq":true,
54+
"clientreq":true
55+
},
56+
{
57+
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
58+
"url" : "http://files.minecraftforge.net/maven/",
59+
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
60+
"serverreq":true,
61+
"clientreq":true
62+
},
63+
{
64+
"name": "org.scala-lang:scala-compiler:2.11.1",
65+
"url" : "http://files.minecraftforge.net/maven/",
66+
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
67+
"serverreq":true,
68+
"clientreq":true
69+
},
70+
{
71+
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
72+
"url" : "http://files.minecraftforge.net/maven/",
73+
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
74+
"serverreq":true,
75+
"clientreq":true
76+
},
77+
{
78+
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
79+
"url" : "http://files.minecraftforge.net/maven/",
80+
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
81+
"serverreq":true,
82+
"clientreq":true
83+
},
84+
{
85+
"name": "org.scala-lang:scala-library:2.11.1",
86+
"url" : "http://files.minecraftforge.net/maven/",
87+
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
88+
"serverreq":true,
89+
"clientreq":true
90+
},
91+
{
92+
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
93+
"url" : "http://files.minecraftforge.net/maven/",
94+
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
95+
"serverreq":true,
96+
"clientreq":true
97+
},
98+
{
99+
"name": "org.scala-lang:scala-reflect:2.11.1",
100+
"url" : "http://files.minecraftforge.net/maven/",
101+
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
102+
"serverreq":true,
103+
"clientreq":true
104+
},
105+
{
106+
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
107+
"url" : "http://files.minecraftforge.net/maven/",
108+
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
109+
"serverreq":true,
110+
"clientreq":true
111+
},
112+
{
113+
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
114+
"url" : "http://files.minecraftforge.net/maven/",
115+
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
116+
"serverreq":true,
117+
"clientreq":true
118+
},
119+
{
120+
"name": "lzma:lzma:0.0.1",
121+
"serverreq":true
122+
},
123+
{
124+
"name": "net.sf.jopt-simple:jopt-simple:4.6",
125+
"serverreq":true
126+
},
127+
{
128+
"name": "java3d:vecmath:1.5.2",
129+
"clientreq":true,
130+
"serverreq":true
131+
},
132+
{
133+
"name": "net.sf.trove4j:trove4j:3.0.3",
134+
"clientreq":true,
135+
"serverreq":true
136+
}
137+
]
138+
}
139+
}

0 commit comments

Comments
 (0)