LordMZTE/Notex-3
1
0
Fork 0
forked from Anvilcraft/Notex-3
Code Issues Pull requests Projects Releases 9 Wiki Activity
66 commits 1 branch 9 tags 182 KiB
Commit graph

66 commits

This branch
This branch
All branches
Author SHA1 Message Date
LordMZTE
a9267261e9 Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-21 13:50:33 +01:00
Timo Ley
4f94308b7f Merge pull request 'make ae2 and rs silicon compatible' (#6) from LordMZTE/Notex-3:feature/siliconfix into master 
Reviewed-on: https://data.tilera.xyz/git/Anvilcraft/Notex-3/pulls/6
 2021-02-21 12:50:32 +00:00
LordMZTE
ef0bd7d393 make ae2 and rs silicon compatible 2021-02-21 13:47:31 +01:00
LordMZTE
8aa641c98c make ae2 and rs silicon compatible
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-21 13:46:25 +01:00
Timo Ley
4b126d8a37 fix assemblylinemachines iron plate recipes (#5) 2021-02-20 19:43:27 +00:00
LordMZTE
150f7ae1ee Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-20 20:43:05 +01:00
LordMZTE
f824bf6fbc fix assemblylinemachines iron plate recipes 2021-02-20 20:28:09 +01:00
LordMZTE
b2fc3887bd fix assemblylinemachines iron plate recipes
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-18 17:57:44 +01:00
Timo Ley
64c9dc48a3 Merge pull request 'fix a bunch of recipe and tag bugs' (#4) from LordMZTE/Notex-3:scriptfixes into master 
Reviewed-on: https://data.tilera.xyz/git/Anvilcraft/Notex-3/pulls/4
 2021-02-18 16:48:38 +00:00
LordMZTE
3654494ead fix a bunch of recipe and tag bugs 2021-02-18 17:43:21 +01:00
LordMZTE
e9e63cbb3a Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-18 14:40:21 +01:00
Timo Ley
4c7d8d4eeb Merge pull request 'cleanup haxe code' (#3) from LordMZTE/Notex-3:scriptcleanup into master 
Reviewed-on: https://data.tilera.xyz/git/Anvilcraft/Notex-3/pulls/3
 2021-02-17 16:20:31 +00:00
LordMZTE
e29ff9d743 Merge branch 'scriptcleanup'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-17 17:20:10 +01:00
LordMZTE
cc64199df0 cleanup haxe code 2021-02-17 15:46:14 +01:00
LordMZTE
d1c6933531 update changelog
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-17 12:56:50 +01:00
LordMZTE
63c3a12d2f Merge remote-tracking branch 'original/master' 2021-02-17 12:42:05 +01:00
Timo Ley
7778dec56f - Added Modular Router 
- Added Ender-Rift
- Added Nether Reactor
- Fixed ALM steel recipes
- Added utility recipes
- Added pulverizer recipe for certus quartz
 2021-02-17 11:33:27 +01:00
LordMZTE
cb5fd6b3b1 Merge remote-tracking branch 'original/master'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-16 14:50:09 +01:00
Timo Ley
e66af04ca6 Merge pull request 'fix haxe code for new kubejs-haxe release' (#2) from LordMZTE/Notex-3:fixhaxe into master 
Reviewed-on: https://data.tilera.xyz/git/Anvilcraft/Notex-3/pulls/2
 2021-02-16 13:49:24 +00:00
LordMZTE
7d019c88f1 fix cicd
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-02-16 14:46:09 +01:00
LordMZTE
d5fe523817 fix haxe code for new kubejs-haxe release 2021-02-16 14:22:38 +01:00
LordMZTE
6ec563f1f7 fix haxe code for new kubejs-haxe release
Some checks failed
continuous-integration/drone/push Build is failing
Details
2021-02-16 14:21:45 +01:00
LordMZTE
17e2bffff2 update changelog
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-14 13:22:10 +01:00
Timo Ley
8229e8a9df - Fixed Gravestone version 2021-02-14 13:22:03 +01:00
LordMZTE
4a47d24f62 Merge remote-tracking branch 'original/master' 2021-02-14 13:18:53 +01:00
Timo Ley
2efec7fd08 Making LordMZTE happy 2021-02-14 12:17:10 +00:00
Timo Ley
94cc1f141d - Removed dragons 
- Added Mining Dimension
- Added Silent Gear
- Added Floocraft
- Added Gravestones
- Changes Spackenmobs spawnrates
 2021-02-14 13:07:47 +01:00
LordMZTE
4c31befb51 Merge branch 'hacked'
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-13 19:46:24 +01:00
LordMZTE
e515a0de20 disable ftbmap waypoints
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-13 17:22:50 +01:00
LordMZTE
41cfcd66d6 fix changelog version
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-13 17:18:14 +01:00
LordMZTE
d9fa81a8ce update changelog
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2021-02-13 17:16:50 +01:00
LordMZTE
88cfc3b363 Merge remote-tracking branch 'original/master' 2021-02-13 17:15:44 +01:00
Timo Ley
df7cf77208 -Removed Bluepower -> mod is buggy 2021-02-13 16:53:22 +01:00
LordMZTE
c23d484d44 Merge branch 'master' into hacked
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-13 14:45:59 +01:00
LordMZTE
a8a69c3b22 add forgehax
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
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
Details
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
Details
2021-02-12 19:42:55 +01:00
LordMZTE
e35cfad86e update changelog
All checks were successful
continuous-integration/drone/push Build is passing
Details
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
Details
2021-02-12 17:52:11 +01:00
LordMZTE
2cf1ea674f cicd now includes modlist 2021-02-12 17:51:18 +01:00
Timo Ley
826d71b0ad -removed Structurize 2021-02-12 17:45:06 +01:00