Compare commits

...

5 Commits

Author SHA1 Message Date
Daniel Borchmann 1507b6c854
Add advtrains construction train 2022-01-30 10:43:16 +01:00
Daniel Borchmann 5aedc6d542
Update mods
This is inspired by a bug in pipeworks.
2022-01-30 10:27:26 +01:00
Daniel Borchmann 9edd5cac2b
Update remote URLs for repositories of VanessaE
Those repositories are not available from the original gitlab remote
anymore, so update them to the one on github.
2022-01-30 10:24:39 +01:00
Daniel Borchmann 7110ccd5ef
Delete obsolete patch 2022-01-08 13:48:09 +01:00
Daniel Borchmann bc222f5ac4
Add more train modes
Will only activate moretrains for now, but having dlxtrains up and ready
is a good thing.
2021-12-31 08:06:34 +01:00
27 changed files with 44 additions and 43 deletions

29
.gitmodules vendored
View File

@ -6,10 +6,10 @@
url = https://bitbucket.org/Infinatum/scaffolding.git
[submodule "plantlife_modpack"]
path = plantlife_modpack
url = https://gitlab.com/VanessaE/plantlife_modpack.git
url = https://github.com/mt-mods/plantlife_modpack
[submodule "moretrees"]
path = moretrees
url = https://gitlab.com/VanessaE/moretrees.git
url = https://github.com/mt-mods/moretrees
[submodule "food"]
path = food
url = https://github.com/rubenwardy/food.git
@ -18,7 +18,7 @@
url = https://notabug.org/TenPlus1/Farming
[submodule "biome_lib"]
path = biome_lib
url = https://gitlab.com/VanessaE/biome_lib.git
url = https://github.com/mt-mods/biome_lib
[submodule "bakedclay"]
path = bakedclay
url = https://notabug.org/TenPlus1/bakedclay
@ -48,13 +48,13 @@
url = https://github.com/minetest-mods/moreores
[submodule "basic_materials"]
path = basic_materials
url = https://gitlab.com/VanessaE/basic_materials.git
url = https://github.com/mt-mods/basic_materials
[submodule "homedecor_modpack"]
path = homedecor_modpack
url = https://gitlab.com/VanessaE/homedecor_modpack.git
url = https://github.com/mt-mods/homedecor_modpack
[submodule "unifieddyes"]
path = unifieddyes
url = https://gitlab.com/VanessaE/unifieddyes.git
url = https://github.com/mt-mods/unifieddyes
[submodule "moreblocks"]
path = moreblocks
url = https://github.com/minetest-mods/moreblocks
@ -63,10 +63,10 @@
url = https://github.com/AiTechEye/hook
[submodule "signs_lib"]
path = signs_lib
url = https://gitlab.com/VanessaE/signs_lib.git
url = https://github.com/mt-mods/signs_lib
[submodule "street_signs"]
path = street_signs
url = https://gitlab.com/VanessaE/street_signs.git
url = https://github.com/mt-mods/street_signs
[submodule "worldedit"]
path = worldedit
url = https://github.com/Uberi/Minetest-WorldEdit
@ -75,7 +75,7 @@
url = https://github.com/minetest-mods/areas/
[submodule "pipeworks"]
path = pipeworks
url = https://gitlab.com/VanessaE/pipeworks.git
url = https://github.com/mt-mods/pipeworks
[submodule "awards"]
path = awards
url = https://gitlab.com/rubenwardy/awards.git/
@ -138,7 +138,7 @@
url = https://github.com/minetest-mods/craftguide
[submodule "currency"]
path = currency
url = https://gitlab.com/VanessaE/currency
url = https://github.com/mt-mods/currency
[submodule "infinite-chest"]
path = infinite-chest
url = https://github.com/cornernote/minetest-infinite_chest
@ -169,3 +169,12 @@
[submodule "basic_trains"]
path = basic_trains
url = https://git.bananach.space/basic_trains.git/
[submodule "moretrains"]
path = moretrains
url = https://git.bananach.space/moretrains.git/
[submodule "dlxtrains_modpack"]
path = dlxtrains_modpack
url = https://github.com/Marnack/dlxtrains_modpack
[submodule "advtrains_construction_train"]
path = advtrains_construction_train
url = https://git.bananach.space/advtrains_construction_train.git/

@ -1 +1 @@
Subproject commit 8dcbc42525360d0037fe6ec3f56f0d12656d45e6
Subproject commit b6651fd396dcd4ae6d75881cbf1712e5210eac9c

@ -1 +1 @@
Subproject commit 5fca3e4322f8829c9ef49e862b8b12ade759fc49
Subproject commit c443459282e396ead5f79f279919ac803f669eb4

@ -1 +1 @@
Subproject commit 78e0c650e3a3d92facef11ddbf3a58a9dc22bae8
Subproject commit ef8391a60d8221f883d54c68373607d7bb3cf4c7

@ -0,0 +1 @@
Subproject commit 2b27b8d8f1a629ff10f295cb8432225a3a9a943b

@ -1 +1 @@
Subproject commit cb713668d26843ddd241272e6169aebbffe95833
Subproject commit d9e06980d33ec02c2321269f47ab9ec32b36551f

@ -1 +1 @@
Subproject commit 4e3493a9812c690052ee319bf94983e95f57f0b6
Subproject commit 396ca881dfea09fae6671dcd17486b356485cd8a

@ -1 +1 @@
Subproject commit 2d7dbc735cdeb703fb01d501a28542a52d450c4e
Subproject commit 79f9cb329462d7154b974dc82e568293ddc0b0a3

@ -1 +1 @@
Subproject commit 6b2bbb4df60019174ea6db1c13535d6bf893d153
Subproject commit f74ee653b8f8c60ea4f78e7dd827dcc568649dee

@ -1 +1 @@
Subproject commit e5e49ed96517373e776cf3574e421fc7ba71fb0e
Subproject commit 61c4c648fd358b4658835772590fae25715d00b0

1
dlxtrains_modpack Submodule

@ -0,0 +1 @@
Subproject commit ee492ec10b79db22ef354fc4cdee16c811607fb4

@ -1 +1 @@
Subproject commit f8533c415ba7007d31bcba10c47295c37321577a
Subproject commit d59e200a42a3077abeee1a8a990de4faceafa7ca

@ -1 +1 @@
Subproject commit 197f667626c90907357245cf815682e9fe6b5cd1
Subproject commit de69c657a359a65877e6c248b58ef338bca07f5d

@ -1 +1 @@
Subproject commit f1dc68ab218215286891c61a594af37116178836
Subproject commit a8fceb249d63f081855cfba1fbd6e2aa86365224

@ -1 +1 @@
Subproject commit 9323445182e47aacba0fc0a2f004f08194283a5a
Subproject commit 4c5b13a3473b970b639e7e63e4a09adfc7abcfe4

@ -1 +1 @@
Subproject commit 7650e9ba5c57a898e3764fb762bafde32d13466e
Subproject commit 8996ad27d8cea20e46851c48c529dc8d3d716c4c

@ -1 +1 @@
Subproject commit 26ec61ee298da28b8c0bfb4d2bda9ce6daf10eee
Subproject commit 18c7f0a422643bf8e00352fc52625323e1881a5a

@ -1 +1 @@
Subproject commit f8a7d66403b4b1e2d87eeb4249a9be3edb906861
Subproject commit dce587cf3397dca7e242455cd017cba50ee28a5b

@ -1 +1 @@
Subproject commit cad72785220f5e6d5243629c5bc55756af086a3a
Subproject commit fb2d58d8c843aa9512f37b12436a2bb5166585f4

1
moretrains Submodule

@ -0,0 +1 @@
Subproject commit 59ee0e4f1577b75ab8736c8a8115c774eeaea3c7

View File

@ -1,11 +0,0 @@
--- a/helicopter/heli_control.lua
+++ b/helicopter/heli_control.lua
@@ -157,7 +157,7 @@ function helicopter.heli_control(self, d
local altitude_consumption_variable = 0
-- if gaining altitude, it consumes more power
- local y_pos_reference = position.y - 200 --after altitude 200 the power need will increase
+ local y_pos_reference = position.y - 400 --after altitude 200 the power need will increase
if y_pos_reference > 0 then altitude_consumption_variable = ((y_pos_reference/1000)^2) end
local consumed_power = (power/1500) + altitude_consumption_variable

2
petz

@ -1 +1 @@
Subproject commit 8fee22f2a6442fed326bac63c3abaf6cb72a13bf
Subproject commit ca8ebc91e20f90a1a696a1d6bb5f8b251f8f8ca1

@ -1 +1 @@
Subproject commit cec6049dd114230468a7e484702240ce8d1c496c
Subproject commit 06fd75421607c97c861cc4e9034b73e5f82af91f

@ -1 +1 @@
Subproject commit 680b02f7e23d27ed491caad6ea20bb53c565f1f5
Subproject commit d3edfbeace32e55820d82cf605439ed8abebf88f

@ -1 +1 @@
Subproject commit 1327cb21123e89710ffcfc33a09a12912054b489
Subproject commit aa5f865131b61eda0e71308f1a83cd10f1ac7b31

@ -1 +1 @@
Subproject commit 8c84751ff814ac5da75b1536bdf6961d9172b315
Subproject commit 25c40fea6cb9c1d563137d3d9088982b073a4435

@ -1 +1 @@
Subproject commit c8afa95542ebd1f14cf46e118e94a96665f3b0ed
Subproject commit c223ca4cec7cb17ddff30f3fd0a35a8c85ca42d5