Compare commits

...

44 commits

Author SHA1 Message Date
LordMZTE 7946054b5f remove broken forgehax mod 2021-09-02 13:38:35 +02:00
LordMZTE a381274ece add inventory essentials
All checks were successful
continuous-integration/drone/push Build is passing
2021-03-12 17:24:27 +01:00
LordMZTE 339dc2da2c Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-22 16:05:32 +01:00
LordMZTE a9267261e9 Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-21 13:50:33 +01:00
LordMZTE 8aa641c98c make ae2 and rs silicon compatible
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-21 13:46:25 +01:00
LordMZTE 150f7ae1ee Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-20 20:43:05 +01:00
LordMZTE b2fc3887bd fix assemblylinemachines iron plate recipes
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-20 20:27:17 +01:00
LordMZTE ea0c45f39e Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-18 17:57:44 +01:00
LordMZTE e9e63cbb3a Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-18 14:40:21 +01:00
LordMZTE e29ff9d743 Merge branch 'scriptcleanup'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-17 17:20:10 +01:00
LordMZTE d1c6933531 update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-17 12:56:50 +01:00
LordMZTE 63c3a12d2f Merge remote-tracking branch 'original/master' 2021-02-17 12:42:05 +01:00
LordMZTE cb5fd6b3b1 Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-16 14:50:09 +01:00
LordMZTE 7d019c88f1 fix cicd
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-16 14:46:09 +01:00
LordMZTE 6ec563f1f7 fix haxe code for new kubejs-haxe release
Some checks failed
continuous-integration/drone/push Build is failing
2021-02-16 14:21:45 +01:00
LordMZTE 17e2bffff2 update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-14 13:25:24 +01:00
LordMZTE e6ef679f99 Merge remote-tracking branch 'original/master' 2021-02-14 13:25:14 +01:00
LordMZTE ef386e84da update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-14 13:22:10 +01:00
LordMZTE 4a47d24f62 Merge remote-tracking branch 'original/master' 2021-02-14 13:18:53 +01:00
LordMZTE 4c31befb51 Merge branch 'hacked'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-14 12:58:53 +01:00
LordMZTE e806db932c add AppleSkin 2021-02-14 12:58:43 +01:00
LordMZTE a01f301b9c Merge branch 'master' into hacked
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 19:46:24 +01:00
LordMZTE e515a0de20 disable ftbmap waypoints
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 19:46:14 +01:00
LordMZTE eb20ea5033 Merge branch 'master' into hacked
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 17:22:50 +01:00
LordMZTE 41cfcd66d6 fix changelog version
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 17:22:42 +01:00
LordMZTE 6b8dff970a Merge branch 'master' into hacked
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 17:18:14 +01:00
LordMZTE d9fa81a8ce update changelog
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-02-13 17:16:50 +01:00
LordMZTE 88cfc3b363 Merge remote-tracking branch 'original/master' 2021-02-13 17:15:44 +01:00
LordMZTE c23d484d44 Merge branch 'master' into hacked
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 14:46:42 +01:00
LordMZTE dc3e6e28af replace ftb map with voxelmap
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-13 14:45:59 +01:00
LordMZTE a8a69c3b22 add forgehax
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 23:22:58 +01:00
LordMZTE cdf12f06da prepare changelog for next release
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 21:15:16 +01:00
LordMZTE 98d87259ff remove falsly advertised performance-reducing mod
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 21:11:28 +01:00
LordMZTE ac59e81432 buildhaxe script will now error when haxe errors
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 19:42:55 +01:00
LordMZTE e35cfad86e update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 17:57:42 +01:00
LordMZTE 6d8f031e9c Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 17:52:11 +01:00
LordMZTE 2cf1ea674f cicd now includes modlist 2021-02-12 17:51:18 +01:00
LordMZTE 6349520835 fix invalid cicd dependency
All checks were successful
continuous-integration/drone/push Build is passing
2021-02-12 17:00:45 +01:00
LordMZTE a876a304e5 add CICD
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2021-02-12 17:00:00 +01:00
LordMZTE 0c3ad21620 Merge remote-tracking branch 'original/master' 2021-02-12 14:09:05 +01:00
LordMZTE da5b6ca387 fix indentation and add formatter config 2021-02-12 13:56:03 +01:00
LordMZTE ba2e6c1868 port kubejs scripts to haxe! 2021-02-12 13:27:49 +01:00
LordMZTE 31dc4ae1e5 add todo list 2021-02-11 19:00:00 +01:00
LordMZTE 1feaee74bf remove stupid mpt script and properly format toml files 2021-02-11 17:51:47 +01:00
12 changed files with 693 additions and 594 deletions

35
.drone.yml Normal file
View file

@ -0,0 +1,35 @@
kind: pipeline
name: release
steps:
- name: build
image: haxe:4.2.0-alpine
commands:
- apk add openjdk8-jre curl
# Download MPT
- curl 'https://data.tilera.xyz/file/mpt/mpt-1.2-SNAPSHOT.jar' -o mpt.jar
- haxelib setup /usr/share/haxe/lib
- haxelib install kubejs
- ./buildhaxe.sh
- java -jar mpt.jar buildtwitch
- java -jar mpt.jar createmodlist --all HTML build/modlist.html
- mv build/notex-*-twitch.zip build/notex-twitch.zip
- name: publish
image: plugins/gitea-release
settings:
base_url: https://data.tilera.xyz/git
api_key:
from_secret: gitea_token
note: CHANGELOG.md
title: tag-${DRONE_TAG}
files:
- build/notex-twitch.zip
- build/modlist.html
when:
event: tag
depends_on:
- build

3
CHANGELOG.md Normal file
View file

@ -0,0 +1,3 @@
# v3.2.2-1
## mods added
- Inventory Essentials

View file

@ -1,4 +1,5 @@
# Notex-3
MZTE fork of the notex3 modpack
## building
Compiling requires [the haxe toolkit](https://haxe.org) to be installed, in order to compile KubeJS scripts and [modpacktools](https://github.com/Anvilcraft/modpacktools) to build the modpack.

6
TODO.wiki Normal file
View file

@ -0,0 +1,6 @@
= TODO =
- [X] Create haxe bindings for kubejs
- [X] Port kubejs scripts to haxe
=== Mods to Add ===

View file

@ -1,6 +1,9 @@
#!/bin/sh
#exit on error
set -e
#REQUIRES https://haxe.org to be installed!
cd src/kubejs/server
haxe build.hxml
cd ../../..

43
mpt
View file

@ -1,43 +0,0 @@
#!/bin/sh
cd "$(dirname "$0")" || exit
case $1 in
install)
if ! [ -d "$HOME/.mpt" ];
then mkdir $HOME/.mpt
fi
if ! [ -f "$HOME/.mpt/mpt.jar" ];
then
dl=$(curl https://data.tilera.xyz/api/mpt.php/latest)
echo Downloading $dl ...
curl $dl --output $HOME/.mpt/mpt.jar
fi
;;
update)
dl=$(curl https://data.tilera.xyz/api/mpt.php/latest)
echo Downloading $dl ...
if [ -f ".mpt/mpt.jar" ]
then
curl $dl --output .mpt/mpt.jar
else
curl $dl --output $HOME/.mpt/mpt.jar
fi
echo Updating Script
curl https://data.tilera.xyz/api/mpt.php/script > mpt
;;
*)
if ! [ -d ".mpt" ];
then mkdir .mpt
fi
if [ -f ".mpt/mpt.jar" ];
then jar=.mpt/mpt.jar
elif [ -f "$HOME.mpt/mpt.jar" ];
then jar=$HOME.mpt/mpt.jar
else
dl=$(curl https://data.tilera.xyz/api/mpt.php/latest)
echo Downloading $dl ...
curl $dl --output .mpt/mpt.jar
jar=.mpt/mpt.jar
fi
java -jar $jar $*
;;
esac

View file

@ -1026,21 +1026,6 @@
"included"
]
},
{
"id": "354143",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:354143:3163347",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"server",
"included"
]
},
{
"id": "248020",
"file": {
@ -2016,6 +2001,48 @@
"included"
]
},
{
"id": "225179",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:225179:3124900",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"included"
]
},
{
"id": "248787",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:248787:3035787",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"included"
]
},
{
"id": "368825",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:368825:3222115",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"included"
]
},
{
"id": "forge",
"versions": "[1.16.4-35.1.37]",
@ -2045,6 +2072,12 @@
"roles": [
"author"
]
},
{
"name": "LordMZTE",
"roles": [
"author"
]
}
]
},

View file

@ -0,0 +1,61 @@
#Noise added to map to make it look less plastic
#Range: 0.0 ~ 0.5
noise = 0.05
#Shadow intensity
#Range: 0.0 ~ 0.3
shadows = 0.1
#Chunk grid overlay in large map
chunk_grid = false
#Reduces color palette to 256 colors
reduced_color_palette = false
#Color intensity
#Range: 0.0 ~ 1.0
saturation = 1.0
#Show claimed chunks on the map
claimed_chunks_on_map = true
#Show your own claimed chunks on the map
own_claimed_chunks_on_map = true
#Show waypoints in world
in_world_waypoints = false
#Enables creation of death waypoints
death_waypoints = false
#Different ways to render map
#Allowed Values: NONE, NIGHT, TOPOGRAPHY, BLOCKS, BIOME_TEMPERATURE, LIGHT_SOURCES
map_mode = "NONE"
#How many blocks should height checks skip in water. 0 means flat water, ignoring terrain
#Range: 0 ~ 128
water_height_factor = 8
#Enables minimap to show up in corner
#Allowed Values: DISABLED, BOTTOM_LEFT, LEFT, TOP_LEFT, TOP_RIGHT, RIGHT, BOTTOM_RIGHT
minimap = "DISABLED"
#Scale of minimap
#Range: 0.25 ~ 4.0
minimap_scale = 1.0
#Minimap will not rotate
minimap_locked_north = true
#Show waypoints on minimap
minimap_waypoints = true
#Show entities on minimap
minimap_entities = true
#Show entity heads on minimap
minimap_entity_heads = true
#Show player heads on minimap
minimap_player_heads = true
#Entities in minimap will be larger
minimap_large_entities = false
#Show XYZ under minimap
minimap_xyz = true
#Show biome under minimap
minimap_biome = true
#Blurs minimap
minimap_blur = true
#Adds NWSE compass inside minimap
minimap_compass = true
#Minimap visibility
#Range: 0 ~ 255
minimap_visibility = 255
#Show zone (claimed chunk or wilderness) under minimap
minimap_zone = true
#Enables debug info
debug_info = false