Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into forkhausen

Browse source
This commit is contained in:
Alexander Minges 2020-05-14 17:58:13 +02:00
commit c6b85fdf93
18 changed files with 73 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mods/ITEMS/REDSTONE/mesecons_torch/init.lua
View file

@ -176,6 +176,10 @@ mcl_torches.register_torch("mesecon_torch_on", S("Redstone Torch"),
{dig_immediate=3, dig_by_water=1, redstone_torch=1, mesecon_ignore_opaque_dig=1},
mcl_sounds.node_sound_wood_defaults(),
{
on_destruct = function(pos, oldnode)
local node = minetest.get_node(pos)
torch_action_on(pos, node)
end,
mesecons = {
receptor = {
state = mesecon.state.on,

2
mods/ITEMS/mcl_banners/README.txt
View file

@ -1,6 +1,6 @@
License of code: WTFPL
License of textures: See README.me in top directory of MineClone 2.
License of textures: See README.md in top directory of MineClone 2.
License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html)
Models author: 22i.

2
mods/ITEMS/mcl_doors/api_doors.lua
View file

@ -360,6 +360,7 @@ function mcl_doors:register_door(name, def)
mesecons = { effector = {
action_on = on_mesecons_signal_open_top,
rules = mesecon.rules.flat,
}},
on_rotate = function(pos, node, user, mode, param2)
@ -478,6 +479,7 @@ function mcl_doors:register_door(name, def)
mesecons = { effector = {
action_off = on_mesecons_signal_close_top,
rules = mesecon.rules.flat,
}},
on_rotate = function(pos, node, user, mode, param2)

1
mods/ITEMS/mcl_doors/depends.txt
View file

@ -2,3 +2,4 @@ mcl_core
mcl_sounds
doc?
screwdriver?
mesecons

2
mods/ITEMS/mcl_fire/README.txt
View file

@ -30,3 +30,5 @@ http://www.freesound.org/people/Dynamicell/sounds/17548/
Benboncan (CC BY 3.0)
https://www.freesound.org/people/Benboncan/sounds/66457/
fire_flint_and_steel.ogg
Other sound files by Perttu Ahola (celeron55) <celeron55@gmail.com> (CC BY-SA 3.0).

2
mods/ITEMS/mcl_furnaces/README.md
View file

@ -9,4 +9,4 @@ Modified by Wuzzy.
License of media
----------------
MIT License
See the main MineClone 2 README.md file.

4
mods/ITEMS/mcl_heads/README.txt
View file

@ -1,4 +0,0 @@
All textures from Faithful Vanilla texture pack.
The mcl_heads_* texture were created by kingoscargames,
based on aforementioned texture pack.

40
mods/ITEMS/mcl_jukebox/README.md
View file

@ -1,22 +1,34 @@
Jukebox mod for MineClone 2.
# Jukebox mod for MineClone 2.
---
Based on the `jdukebox` mod by Jordach. This adds a jukebox block and
music disc. Just place a music disc in a jukebox and music starts
to play. And that's it!
Licenced as GPLv3.
## Track list
Based on the jdukebox mod by Jordach.
Music by Jordach, HeroOfTheWinds and Junichi Masuda
(see in-game item tooltip for details).
`mcl_jukebox_track_1.ogg`: “The Evil Sister (Jordach's Mix)” by SoundHelix (CC0)
`mcl_jukebox_track_2.ogg`: “The Energetic Rat (Jordach's Mix)” by SoundHelix (CC0)
`mcl_jukebox_track_3.ogg`: “Eastern Feeling” by Jordach (CC0)
`mcl_jukebox_track_4.ogg`: “Minetest” by Jordach (CC0)
`mcl_jukebox_track_5.ogg`: “Credit Roll (Jordach's HD Mix)” by Junichi Masuda (CC0)
`mcl_jukebox_track_6.ogg`: “Winter Feeling" by Tom Peter (CC BY-SA 3.0)
`mcl_jukebox_track_7.ogg`: “Synthgroove (Jordach's Mix)” by HeroOfTheWinds (CC0)
`mcl_jukebox_track_8.ogg`: “The Clueless Frog (Jordach's Mix)” by SoundHelix (CC0)
`mcl_jukebox_track_6.ogg`
“Winter Feeling”, by Tom Peter
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) <http://creativecommons.org/licenses/by-sa/3.0/>
Source: <https://opengameart.org/content/winter-feeling>
Note: 9 tracks are included. 3 music disc textures are currently unused.
### Sources
---
* “Winter Feeling”: <https://opengameart.org/content/winter-feeling>
* Other tracks: <https://github.com/Jordach/jdukebox/>
Textures from Faithful texture pack.
### License
9 tracks are included.
3 music disc textures are currently unused.
Code licenced as GPLv3. Music under individual licenses (see abbreviations
above). Texture license: See main MineClone 2 README.md file.
See here for the full license texts:
* CC0: <https://creativecommons.org/publicdomain/zero/1.0/>
* CC BY-SA 3.0: <http://creativecommons.org/licenses/by-sa/3.0/>
* GPLv3: <https://www.gnu.org/licenses/gpl-3.0.html>

2
mods/ITEMS/mcl_portals/README.md
View file

@ -8,7 +8,7 @@ End portal: Build an upright frame of red nether brick blocks, 4 blocks wide and
Created by maikerumine and Wuzzy.
Code license: MIT License (see `LICENSE`).
Texture license: See main MineClone 2 directory.
Texture license: See README.md in main MineClone 2 directory.
License of sound: [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
Authors: [FreqMan](https://freesound.org/people/FreqMan/) and Wuzzy

4
mods/ITEMS/mcl_potions/README.txt
View file

@ -1,5 +1,5 @@
License information:
* Code: WTFPL
* Textures: From Faithful 32×32 texture pack (see main MineClone 2 license notes)
* Code: MIT License
* Textures: See main MineClone 2 README.md file
* Sounds: CC0

2
mods/ITEMS/mcl_signs/README.txt
View file

@ -6,7 +6,7 @@ License of code and font: MIT License
Font source: 04.jp.org, some modifications and additions were made (added support for Latin-1 Supplement)
Original font license text states: “YOU MAY USE THEM AS YOU LIKE” (in about.gif file distributed with the font)
License of textures: See README.me in top directory of MineClone 2.
License of textures: See README.md in top directory of MineClone 2.
License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html)
Models author: 22i.