Browse Source

Changed deprecated VanessaE account URLs. Note deprecated forks.

master
poikilos 3 years ago
parent
commit
ee1986ee4e
  1. 2
      buildenliven.py
  2. 20
      doc/deprecated.md
  3. 23
      doc/deprecated/ilights/readme.md
  4. 16
      utilities/extra/install-ENLIVEN-minetest_game.sh

2
buildenliven.py

@ -45,7 +45,7 @@ gamespec['add_mods'] = [
{'repo':"https://github.com/BenjieFiftysix/sponge.git"}, {'repo':"https://github.com/BenjieFiftysix/sponge.git"},
{'repo':"https://github.com/poikilos/throwing.git"}, # Can utilize toolranks, toolranks_extras, wielded_light {'repo':"https://github.com/poikilos/throwing.git"}, # Can utilize toolranks, toolranks_extras, wielded_light
{'repo':"https://github.com/poikilos/throwing_arrows.git"}, # Can utilize mesecons, mesecons_button {'repo':"https://github.com/poikilos/throwing_arrows.git"}, # Can utilize mesecons, mesecons_button
{'repo':"https://gitlab.com/VanessaE/biome_lib.git"}, {'repo':"https://github.com/mt-mods/biome_lib.git"},
{ {
'repo': "https://github.com/Poikilos/vines.git", 'repo': "https://github.com/Poikilos/vines.git",
'branch': "Bucket_Game", # git clone <url> --branch <branch> 'branch': "Bucket_Game", # git clone <url> --branch <branch>

20
doc/deprecated.md

@ -1,5 +1,25 @@
# Deprecated # Deprecated
## Forks
- https://gitlab.com/poikilos/ilights
- Poikilos' copy: ~/metaprojects/deprecated
- Revert to 5a4cc589434de2e24b9f2b128cfb5f5ccef7f385 (CC BY-SA version of code before change to LGPL v3.0)
- The revert doesn't seem complete, because newer commits are present (up to "fix the 'fix'" 51a4625).
- For the details of how the fork was constructed, see the modified ilights readme link discussed under the "Merge branch..." point below.
- The fork still had the "LICENSE" file with the separate licenses for code and media.
- `lighten "off" bulb a bit (way too dark) + update license` (manually cherry pick commit 6398d89 by VanessaE but change the commit to add a copy of the license)
- "Merge branch 'old-license-branch' into 'master'":
- Change readme (See [deprecated/ilights/readme.md](deprecated/ilights/readme.md). The upstream version only says "Repo for ilights mod.")
- Add license.txt (Attribution-ShareAlike 4.0 International).
- https://gitlab.com/poikilos/moretrees
- Poikilos' copy: ~/metaprojects/deprecated
- only adds depends.txt
- https://gitlab.com/poikilos/plantlife_modpack
- Poikilos' copy: ~/metaprojects/deprecated
- only adds depends.txt files
## enissue.py ## enissue.py
### argparse ### argparse
Why: making mutually exclusive arguments or subcommands optional Why: making mutually exclusive arguments or subcommands optional

23
doc/deprecated/ilights/readme.md

@ -0,0 +1,23 @@
# ilights
Add industrial lights to Minetest.
## License
CC BY-SA 4.0
Copyright (c) 2014 DanDuncombe, (c) 2019 VanessaE
## History
This branch is the old CC version of the code, with new textures cherry
picked.
```
git clone https://gitlab.com/poikilos/ilights ilights
cd ilights && \
git checkout -b old-license-branch 5a4cc589 && \
git cherry-pick 6398d89b80a0bb20da9908babe04599a38a7e0f8
mv ilights_lamp_bulb_off.png ../
mv ilights_lamp_lens_off.png ../
git reset --hard
# ^ reset to avoid "unmerged" due to conflict
mv ../ilights_lamp_bulb_off.png ./
mv ../ilights_lamp_lens_off.png ./
```
## Tasks
- [ ] actually use the new textures (add the ability to turn them off
or require power)

16
utilities/extra/install-ENLIVEN-minetest_game.sh

@ -517,7 +517,7 @@ fi
add_git_mod moreblocks moreblocks https://github.com/minetest-mods/moreblocks.git add_git_mod moreblocks moreblocks https://github.com/minetest-mods/moreblocks.git
# plantlife_modpack: includes bushes:* with fruit and fruit recipes # plantlife_modpack: includes bushes:* with fruit and fruit recipes
add_git_mod plantlife_modpack plantlife_modpack https://gitlab.com/VanessaE/plantlife_modpack.git add_git_mod plantlife_modpack plantlife_modpack https://github.com/mt-mods/plantlife_modpack.git
add_git_mod bushes_soil bushes_soil https://github.com/poikilos/bushes_soil.git add_git_mod bushes_soil bushes_soil https://github.com/poikilos/bushes_soil.git
# forum_url="https://forum.minetest.net/viewtopic.php?f=9&t=12368" # forum_url="https://forum.minetest.net/viewtopic.php?f=9&t=12368"
@ -562,12 +562,12 @@ add_git_mod lapis LapisLazuli https://github.com/Napiophelios/LapisLazuli.git
echo "not installing helicopter--crashes 0.4.14-git, but was updated on 2017-06-08 and was not tested since then" echo "not installing helicopter--crashes 0.4.14-git, but was updated on 2017-06-08 and was not tested since then"
# add_git_mod helicopter helicopter https://github.com/SokolovPavel/helicopter.git # add_git_mod helicopter helicopter https://github.com/SokolovPavel/helicopter.git
add_git_mod biome_lib biome_lib https://gitlab.com/VanessaE/biome_lib.git add_git_mod biome_lib biome_lib https://github.com/mt-mods/biome_lib.git
add_git_mod moretrees moretrees https://gitlab.com/VanessaE/moretrees.git add_git_mod moretrees moretrees https://github.com/mt-mods/moretrees.git
# in order of dependency (also, clicking armor in unified inventory crashes the game without technic installed since checks radation): # in order of dependency (also, clicking armor in unified inventory crashes the game without technic installed since checks radation):
add_git_mod mesecons mesecons https://github.com/minetest-mods/mesecons add_git_mod mesecons mesecons https://github.com/minetest-mods/mesecons
add_git_mod pipeworks pipeworks https://gitlab.com/VanessaE/pipeworks.git add_git_mod pipeworks pipeworks https://github.com/mt-mods/pipeworks.git
add_git_mod technic technic https://github.com/minetest-mods/technic.git add_git_mod technic technic https://github.com/minetest-mods/technic.git
#add_git_mod technic technic https://github.com/t4im/technic.git #add_git_mod technic technic https://github.com/t4im/technic.git
@ -677,9 +677,9 @@ add_git_mod ts_furniture ts_furniture https://github.com/minetest-mods/ts_furnit
#mv minetest-3d_armor_MODPACK/wieldview $MT_MYGAME_MODS_PATH/wieldview #mv minetest-3d_armor_MODPACK/wieldview $MT_MYGAME_MODS_PATH/wieldview
#mv minetest-3d_armor_MODPACK/3d_armor $MT_MYGAME_MODS_PATH/3d_armor #mv minetest-3d_armor_MODPACK/3d_armor $MT_MYGAME_MODS_PATH/3d_armor
#mv minetest-3d_armor_MODPACK/shields $MT_MYGAME_MODS_PATH/shields #mv minetest-3d_armor_MODPACK/shields $MT_MYGAME_MODS_PATH/shields
add_git_mod basic_materials basic_materials https://gitlab.com/VanessaE/basic_materials.git add_git_mod basic_materials basic_materials https://github.com/mt-mods/basic_materials.git
add_git_mod homedecor_modpack homedecor_modpack https://gitlab.com/VanessaE/homedecor_modpack.git add_git_mod homedecor_modpack homedecor_modpack https://github.com/mt-mods/homedecor_modpack.git
add_git_mod unifieddyes unifieddyes https://gitlab.com/VanessaE/unifieddyes.git add_git_mod unifieddyes unifieddyes https://github.com/mt-mods/unifieddyes.git
#Sokomine's original version has no security ( https://forum.minetest.net/viewtopic.php?id=4877 ) #Sokomine's original version has no security ( https://forum.minetest.net/viewtopic.php?id=4877 )
# https://github.com/Sokomine/travelnet/archive/master.zip # https://github.com/Sokomine/travelnet/archive/master.zip
# manually get branch with sound: # manually get branch with sound:
@ -690,7 +690,7 @@ add_git_mod sling sling https://github.com/minetest-mods/sling.git
#REPLACES PilzAdam's, modified by kaeza, maintained by VenessaE; FORMERLY in homedecor_modpack #REPLACES PilzAdam's, modified by kaeza, maintained by VenessaE; FORMERLY in homedecor_modpack
#forum post: https://forum.minetest.net/viewtopic.php?t=13762 #forum post: https://forum.minetest.net/viewtopic.php?t=13762
# kaeza's signs_lib (forked from PilzAdam's and TheXYZ's code) was moved here from: https://github.com/kaeza/minetest-signs_lib-extrafonts/archive/master.zip # kaeza's signs_lib (forked from PilzAdam's and TheXYZ's code) was moved here from: https://github.com/kaeza/minetest-signs_lib-extrafonts/archive/master.zip
add_git_mod signs_lib signs_lib https://gitlab.com/VanessaE/signs_lib.git add_git_mod signs_lib signs_lib https://github.com/mt-mods/signs_lib.git
farming_redo_enable="false" farming_redo_enable="false"
echo "farming_redo_enable=\"$farming_redo_enable\"" >> "$release_rc" echo "farming_redo_enable=\"$farming_redo_enable\"" >> "$release_rc"

Loading…
Cancel
Save