mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 15:43:13 +09:00
Merge branch 'master' into remoteMap
This commit is contained in:
commit
936600c98b
2 files changed
+17
-12
No files matched your search
+6
-1
@@ -1,4 +1,4 @@
|
|||||||
MIT License
|
This product uses the MIT License
|
||||||
|
|
||||||
Copyright (c) 2016 Daniel Vestøl
|
Copyright (c) 2016 Daniel Vestøl
|
||||||
|
|
||||||
@@ -19,3 +19,8 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
|
The icons for angels modded items located in /static/pictures/ are licensed
|
||||||
|
by https://mods.factorio.com/user/Arch666Angel under CC BY-NC-ND 4.0
|
||||||
|
https://creativecommons.org/licenses/by-nc-nd/4.0/
|
||||||
|
|
||||||
+11
-11
@@ -61,17 +61,17 @@ var directories = [
|
|||||||
"instances",
|
"instances",
|
||||||
];
|
];
|
||||||
let downloadList = [
|
let downloadList = [
|
||||||
{
|
// {
|
||||||
url: "http://fbpviewer.trakos.pl/images/spritesheet.json",
|
// url: "http://fbpviewer.trakos.pl/images/spritesheet.json",
|
||||||
file: "static/pictures/spritesheet.js",
|
// file: "static/pictures/spritesheet.js",
|
||||||
callback: function(file){
|
// callback: function(file){
|
||||||
fs.writeFileSync("static/pictures/spritesheet.js", "export default\n"+fs.readFileSync("static/pictures/spritesheet.js"));
|
// fs.writeFileSync("static/pictures/spritesheet.js", "export default\n"+fs.readFileSync("static/pictures/spritesheet.js"));
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
url: "http://fbpviewer.trakos.pl/images/spritesheet.png",
|
// url: "http://fbpviewer.trakos.pl/images/spritesheet.png",
|
||||||
file: "static/pictures/spritesheet.png",
|
// file: "static/pictures/spritesheet.png",
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
url: "https://code.jquery.com/jquery.js",
|
url: "https://code.jquery.com/jquery.js",
|
||||||
file: "static/external/jquery.js",
|
file: "static/external/jquery.js",
|
||||||
|
|||||||
Reference in new issue
Block a user