develop #30

Merged
milan merged 8 commits from develop into master 2021-01-27 21:59:08 +01:00
966 changed files with 91035 additions and 89618 deletions

View file

@ -11,7 +11,7 @@ git clone --depth 1 --branch master https://github.com/minetest-mods/moreores.gi
git clone --depth 1 --branch master https://github.com/minetest-mods/mywalls.git
git clone --depth 1 --branch master https://github.com/minetest-mods/xdecor.git
git clone --depth 1 --branch master https://github.com/minetest-mods/vehicle_mash.git
git clone --depth 1 --branch master https://github.com/Panquesito7/lib_mount.git
git clone --depth 1 --branch master https://github.com/minetest-mods/lib_mount
git clone --depth 1 --branch master https://github.com/minetest-mods/workbench.git
git clone --depth 1 --branch master https://github.com/minetest-mods/ts_furniture.git
git clone --depth 1 --branch master https://github.com/minetest-mods/playeranim.git
@ -98,7 +98,6 @@ git clone --depth 1 --branch master https://notabug.org/TenPlus1/mobs_sky.git
git clone --depth 1 --branch master https://github.com/Uberi/Minetest-WorldEdit.git
git clone --depth 1 --branch master https://github.com/minetest-mods/realchess.git
git clone --depth 1 --branch master https://github.com/Grizzly-Adam/BBQ.git
git clone --depth 1 --branch master git://cheapiesystems.com/mail
git clone --depth 1 --branch master https://github.com/minetest-mods/mydoors.git
git clone --depth 1 --branch master https://github.com/TumeniNodes/angledwalls.git
git clone --depth 1 --branch master https://github.com/pyrollo/display_modpack.git
@ -111,7 +110,6 @@ git clone --depth 1 --branch master https://github.com/Extex101/christmas.git
git clone --depth 1 --branch master https://gitlab.com/VanessaE/gloopblocks.git
git clone --depth 1 --branch master https://github.com/minetest-mods/mylandscaping.git
git clone --depth 1 --branch master https://gitlab.com/VanessaE/minislots.git
git clone --depth 1 --branch master git://cheapiesystems.com/prefab_redo
git clone --depth 1 --branch master https://github.com/v-rob/bridger.git
git clone --depth 1 --branch master https://github.com/AiTechEye/smartshop.git
git clone --depth 1 --branch master https://repo.or.cz/minetest_colorcubes.git
@ -130,6 +128,9 @@ git clone --depth 1 --branch master https://github.com/qwrwed/lightsplus.git
git clone --depth 1 --branch master https://github.com/khonkhortisan/rubiks.git
git clone --branch master https://git.bananach.space/advtrains.git
git clone --depth 1 --branch master https://github.com/Dragonop/claycrafter
git clone --depth 1 --branch master https://notabug.org/NetherEran/hot_air_balloons.git
git clone --branch master https://cheapiesystems.com/git/prefab_redo
git clone --branch master https://cheapiesystems.com/git/mail
#Clean git stuff

View file

@ -216,7 +216,6 @@ load_mod_font_api = true
load_mod_poisonivy = true
load_mod_xdecor = true
load_mod_trunks = true
load_mod_mobs_bat = true
load_mod_playeranim = true
load_mod_playerplus = true
load_mod_prefab_redo = true
@ -267,3 +266,6 @@ load_mod_advtrains_itrainmap = true
load_mod_assets = true
load_mod_advtrains_signals_ks = true
load_mod_claycrafter = true
load_mod_serialize_lib = true
load_mod_mobs_sky = false
load_mod_hot_air_balloons = true

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 B

After

Width:  |  Height:  |  Size: 91 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 355 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 476 B

View file

@ -104,10 +104,10 @@ function advtrains.set_trainhud(name, text, driver)
local driverhud = {
hud_elem_type = "image",
name = "ADVTRAINS_DRIVER",
position = {x=0.5, y=0.7},
offset = {x=0,y=5},
position = {x=0.5, y=1},
offset = {x=0,y=-170},
text = driver or "",
alignment = {x=0,y=1},
alignment = {x=0,y=-1},
scale = {x=1,y=1},}
if not hud then
hud = {["driver"]={}}
@ -116,8 +116,8 @@ function advtrains.set_trainhud(name, text, driver)
hud_elem_type = "text",
name = "ADVTRAINS",
number = 0xFFFFFF,
position = {x=0.5, y=0.7},
offset = {x=0, y=-5},
position = {x=0.5, y=1},
offset = {x=0, y=-300},
text = text,
scale = {x=200, y=60},
alignment = {x=0, y=-1},
@ -184,32 +184,14 @@ function advtrains.hud_train_format(train, flip)
local vel = advtrains.abs_ceil(train.velocity)
local vel_kmh=advtrains.abs_ceil(advtrains.ms_to_kmh(train.velocity))
local levers = {[0] = "emg","b","r","n","p"}
local lvrcolor = {[0] = "red", "orange", "orange", "cyan", "cyan"}
local tlev=train.lever or 1
if train.velocity==0 and not train.active_control then tlev=1 end
local ht = {"[combine:440x110:0,0=(advtrains_hud_bg.png^[resize\\:440x110)"}
local st = {}
if train.debug then st = {train.debug} end
local ht = {"[combine:300x150:0,0=(advtrains_hud_bg.png^[resize\\:300x150)"}
ht[#ht+1] = "100,0=(advtrains_hud_" .. (flip and "reverse" or "forward") .. ".png^[resize\\:100x20^[makealpha\\:#000000)"
ht[#ht+1] = "200,0=(advtrains_hud_" .. (levers[tlev] or "bg") .. ".png^[resize\\:100x20^[multiply\\:" .. (lvrcolor[tlev] or "#000000") .. "^[makealpha\\:#000000)"
if train.tarvelocity or train.atc_command then
ht[#ht+1] = "100,20=(advtrains_hud_atc.png^[resize\\:100x20^[makealpha\\:#000000)"
end
if train.ctrl.lzb then
ht[#ht+1] = "200,20=(advtrains_hud_lzb.png^[resize\\:100x20^[multiply\\:red^[makealpha\\:#000000)"
end
if train.is_shunt then
ht[#ht+1] = "100,40=(advtrains_hud_shunt.png^[resize\\:100x20^[makealpha\\:#000000)"
end
if train.door_open == -1 then
ht[#ht+1] = "100,60=(advtrains_hud_left_door.png^[resize\\:100x20^[makealpha\\:#000000)"
elseif train.door_open == 1 then
ht[#ht+1] = "200,60=(advtrains_hud_right_door.png^[resize\\:100x24^[makealpha\\:#000000)"
end
-- speed indication(s)
-- seven-segment display
local function sevenseg(digit, x, y, w, h, m)
--[[
-1-
@ -246,34 +228,71 @@ function advtrains.hud_train_format(train, flip)
end
end
end
sevenseg(math.floor(vel/10), 5, 5, 20, 10, "[colorize\\:red\\:255")
sevenseg(vel%10, 55, 5, 20, 10, "[colorize\\:red\\:255")
-- lever
ht[#ht+1] = "275,10=(advtrains_hud_bg.png^[colorize\\:cyan^[resize\\:5x18)"
ht[#ht+1] = "275,28=(advtrains_hud_bg.png^[colorize\\:white^[resize\\:5x18)"
ht[#ht+1] = "275,46=(advtrains_hud_bg.png^[colorize\\:orange^[resize\\:5x36)"
ht[#ht+1] = "275,82=(advtrains_hud_bg.png^[colorize\\:red^[resize\\:5x18)"
ht[#ht+1] = "292,16=(advtrains_hud_bg.png^[colorize\\:darkslategray^[resize\\:6x78)"
ht[#ht+1] = sformat("280,%s=(advtrains_hud_bg.png^[colorize\\:gray^[resize\\:30x18)",18*(4-tlev)+10)
-- reverser
ht[#ht+1] = sformat("245,10=(advtrains_hud_arrow.png^[transformFY%s)", flip and "" or "^[multiply\\:cyan")
ht[#ht+1] = sformat("245,85=(advtrains_hud_arrow.png%s)", flip and "^[multiply\\:orange" or "")
ht[#ht+1] = "250,35=(advtrains_hud_bg.png^[colorize\\:darkslategray^[resize\\:5x40)"
ht[#ht+1] = sformat("240,%s=(advtrains_hud_bg.png^[resize\\:25x15^[colorize\\:gray)", flip and 65 or 30)
-- train control/safety indication
if train.tarvelocity or train.atc_command then
ht[#ht+1] = "10,10=(advtrains_hud_atc.png^[resize\\:30x30^[multiply\\:cyan)"
end
if train.ctrl.lzb then
ht[#ht+1] = "50,10=(advtrains_hud_lzb.png^[resize\\:30x30^[multiply\\:red)"
end
if train.is_shunt then
ht[#ht+1] = "90,10=(advtrains_hud_shunt.png^[resize\\:30x30^[multiply\\:orange)"
end
-- door
ht[#ht+1] = "187,10=(advtrains_hud_bg.png^[resize\\:26x30^[colorize\\:white)"
ht[#ht+1] = "189,12=(advtrains_hud_bg.png^[resize\\:22x11)"
ht[#ht+1] = sformat("170,10=(advtrains_hud_bg.png^[resize\\:15x30^[colorize\\:%s)", train.door_open==-1 and "white" or "darkslategray")
ht[#ht+1] = "172,12=(advtrains_hud_bg.png^[resize\\:11x11)"
ht[#ht+1] = sformat("215,10=(advtrains_hud_bg.png^[resize\\:15x30^[colorize\\:%s)", train.door_open==1 and "white" or "darkslategray")
ht[#ht+1] = "217,12=(advtrains_hud_bg.png^[resize\\:11x11)"
-- speed indication(s)
sevenseg(math.floor(vel/10), 320, 10, 30, 10, "[colorize\\:red\\:255")
sevenseg(vel%10, 380, 10, 30, 10, "[colorize\\:red\\:255")
for i = 1, vel, 1 do
ht[#ht+1] = sformat("%d,100=(advtrains_hud_bg.png^[resize\\:11x30^[colorize\\:white)", i*14-3)
ht[#ht+1] = sformat("%d,65=(advtrains_hud_bg.png^[resize\\:8x20^[colorize\\:white)", i*11-1)
end
for i = max+1, 20, 1 do
ht[#ht+1] = sformat("%d,100=(advtrains_hud_bg.png^[resize\\:11x30^[colorize\\:darkslategray)", i*14-3)
ht[#ht+1] = sformat("%d,65=(advtrains_hud_bg.png^[resize\\:8x20^[colorize\\:darkslategray)", i*11-1)
end
if res and res > 0 then
ht[#ht+1] = sformat("%d,95=(advtrains_hud_bg.png^[resize\\:3x40^[colorize\\:red\\:255)", 8+res*14)
ht[#ht+1] = sformat("%d,60=(advtrains_hud_bg.png^[resize\\:3x30^[colorize\\:red\\:255)", 7+res*11)
end
if train.tarvelocity then
ht[#ht+1] = sformat("%d,130=(advtrains_hud_arrow.png^[multiply\\:cyan^[transformFY^[makealpha\\:#000000)", 2+train.tarvelocity*14)
ht[#ht+1] = sformat("%d,85=(advtrains_hud_arrow.png^[multiply\\:cyan^[transformFY^[makealpha\\:#000000)", 1+train.tarvelocity*11)
end
local lzb = train.lzb
if lzb and lzb.oncoming then
local oc = lzb.oncoming
for i = 1, #oc do
local spd = oc[i].spd
if not spd then
ht[#ht+1] = "203,43=(advtrains_hud_bg.png^[resize\\:14x14^[colorize\\:lime\\:255)"
elseif spd == 0 then
ht[#ht+1] = "283,43=(advtrains_hud_bg.png^[resize\\:14x14^[colorize\\:red\\:255)"
elseif tonumber(spd) then
ht[#ht+1] = "243,43=(advtrains_hud_bg.png^[resize\\:14x14^[colorize\\:orange\\:255)"
ht[#ht+1] = sformat("%d,85=(advtrains_hud_arrow.png^[multiply\\:red^[makealpha\\:#000000)", 2+spd*14)
local c = not spd and "lime" or (type(spd) == "number" and (spd == 0) and "red" or "orange") or nil
if c then
ht[#ht+1] = sformat("130,10=(advtrains_hud_bg.png^[resize\\:30x5^[colorize\\:%s)",c)
ht[#ht+1] = sformat("130,35=(advtrains_hud_bg.png^[resize\\:30x5^[colorize\\:%s)",c)
if spd and spd~=0 then
ht[#ht+1] = sformat("%d,50=(advtrains_hud_arrow.png^[multiply\\:red^[makealpha\\:#000000)", 1+spd*11)
end
local floor = math.floor
local dist = floor(((oc[i].idx or train.index)-train.index))
dist = math.max(0, math.min(999, dist))
for j = 1, 3, 1 do
sevenseg(floor((dist/10^(3-j))%10), 119+j*11, 18, 4, 2, "[colorize\\:"..c)
end
break
end
break
end
end
@ -291,7 +310,7 @@ end
local _, texture = advtrains.hud_train_format { -- dummy train object to demonstrate the train hud
max_speed = 15, speed_restriction = 15, velocity = 15, tarvelocity = 12,
active_control = true, lever = 3, ctrl = {lzb = true}, is_shunt = true,
door_open = 1, lzb = {oncoming = {{spd=6}}}
door_open = 1, lzb = {oncoming = {{spd=6, idx=125.7}}}, index = 0,
}
minetest.register_node("advtrains:hud_demo",{

View file

@ -38,9 +38,9 @@ local function save_atomic_move_file(filename)
if windows_mode then
local delsucc, err = os.remove(filename)
if not delsucc then
serialize_lib.log_error("Unable to delete old savefile '"..filename.."':")
serialize_lib.log_error(err)
return nil, err
serialize_lib.log_warn("Unable to delete old savefile '"..filename.."':")
serialize_lib.log_warn(err)
serialize_lib.log_info("Trying to replace the save file anyway now...")
end
end
@ -48,11 +48,13 @@ local function save_atomic_move_file(filename)
local mvsucc, err = os.rename(filename..".new", filename)
if not mvsucc then
if minetest.settings:get_bool("serialize_lib_no_auto_windows_mode") or windows_mode then
serialize_lib.log_error("Unable to move '"..filename.."':")
serialize_lib.log_error("Unable to replace save file '"..filename.."':")
serialize_lib.log_error(err)
return nil, err
else
-- enable windows mode and try again
serialize_lib.log_info("Unable to replace save file '"..filename.."' by direct renaming:")
serialize_lib.log_info(err)
serialize_lib.log_info("Enabling Windows mode for atomic saving...")
windows_mode = true
return save_atomic_move_file(filename)

View file

@ -190,6 +190,7 @@ local function write_to_fd(root_table, file, config)
file:write("LUA_SER v=1\n")
write_table(root_table, file, config)
file:write("E\nEND_SER\n")
file:close()
end
-- Reads the file contents from the passed file descriptor and returns the table on success

View file

@ -1 +1,4 @@
name = ambience
depends = default
optional_depends = fire, playerplus
description = Adds realistic sound effects into your world.

View file

@ -1 +1,4 @@
name = bakedclay
name = bakedclay
depends = default
optional_depends = stairs, moreblocks, lucky_block, technic_cnc
description = Adds the ability to bake clay into blocks and colour them with dye.

View file

@ -0,0 +1,34 @@
# textdomain: basic_materials
# Author: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Silicon lump=Grumo di silicio
Simple Integrated Circuit=Circuito integrato semplice
Simple Motor=Motore semplice
Heating element=Elemento riscaldante
Simple energy crystal=Cristallo di energia semplice
Spool of steel wire=Bobina di filo d'acciaio
Spool of copper wire=Bobina di filo di rame
Spool of silver wire=Bobina di filo d'argento
Spool of gold wire=Bobina di filo d'oro
Steel Strip=Striscia d'acciaio
Copper Strip=Striscia di rame
Steel Bar=Barra d'acciaio
Chainlinks (brass)=Catena (ottone)
Chainlinks (steel)=Catena (acciaio)
Brass Ingot=Lingotto di ottone
Steel gear=Ingranaggio d'acciaio
Padlock=Catenaccio
Chain (steel, hanging)=Catena (acciaio, pendente)
Chain (brass, hanging)=Catena (ottone, pendente)
Brass Block=Blocco di ottone
Oil extract=Estratto d'olio
Unprocessed paraffin=Paraffina grezza
Uncooked Terracotta Base=Argilla cruda
Wet Cement=Cemento umido
Cement=Cemento
Concrete Block=Blocco di calcestruzzo
Plastic sheet=Foglio di plastica
Plastic strips=Striscia di plastica
Empty wire spool=Rocchetto vuoto

View file

@ -1 +1 @@
This mod adds bees and hives to Minetest
Adds bees and hives to Minetest.

View file

@ -1 +1,4 @@
name = bees
depends = default
optional_depends = intllib, lucky_block
description = Adds bees and hives to Minetest.

View file

@ -1 +1,4 @@
name = bonemeal
name = bonemeal
depends = default
optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye
description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings.

View file

@ -1 +1,4 @@
name = bows
depends = default
optional_depends = mobs, lucky_block
description = Adds a selection of bows and arrows for players to use in-game.

View file

@ -1 +1,4 @@
name = builtin_item
depends = default
optional_depends =
description = Dropped items can now be pushed by water and have their own custom functions.

View file

@ -36,9 +36,12 @@ Copyright (C) [Melkor](https://forum.minetest.net/memberlist.php?mode=viewprofil
- `cloud_items_car_cloud.png` - [`car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/car_white.png)
- `cloud_items_car_cloud_inventory.png` - [`inv_car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/inv_car_white.png)
Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2018 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)):
Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2019 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)):
- All [`3d_armor`](https://github.com/stujones11/minetest-3d_armor) [textures](https://github.com/stujones11/minetest-3d_armor/tree/master/3d_armor/textures).
- `cloud_items_gloves_cloud.png` - [`3d_armor_gloves_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel.png)
- `cloud_items_gloves_cloud_preview.png` - [`3d_armor_gloves_gloves_steel_preview.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel_preview.png)
- `cloud_items_gloves_inv_gloves_cloud.png` - [`3d_armor_gloves_inv_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_inv_gloves_steel.png)
## License for source code

View file

@ -33,8 +33,12 @@ Have any questions/comments? Submit an [issue](https://github.com/minetest-mods/
This "ore", doesn't spawn underground!\
Instead, it spawns at the sky; that's why it's called "cloud".
An ore will be spawned inside the schematic.\
You have less chances to find an ore, than not to find an ore.
An ore will be spawned somewhere in the schematic!\
You'll have certain probabilities to have an ore or not!
- For small clouds: 2.5% of getting an ore per node.
- For medium clouds: 5% of getting an ore per node.
- For big clouds: 7.5% of getting an ore per node.
Small schematic
![Small schematic](https://user-images.githubusercontent.com/51391473/69098689-af9fbf00-0a1e-11ea-9e88-c74a6b74baa3.png)
@ -108,6 +112,7 @@ There are 4 types of cloud:
- [`toolranks`](https://github.com/lisacvuk/minetest-toolranks)
- [`moreblocks`](https://github.com/minetest-mods/moreblocks)
- [`multitools`](https://github.com/ChimneySwift/multitools)
- [`3d_armor_gloves`](https://github.com/sirrobzeroone/3d_armor_gloves)
- `stairs` (included in [Minetest Game](https://github.com/minetest/minetest_game))
## Requirements

View file

@ -78,6 +78,50 @@ minetest.register_node("cloud_items:decorative_cloud", {
sounds = default.node_sound_stone_defaults(),
})
-- On-generation nodes. These nodes are used
-- immediately right after generation.
minetest.register_node("cloud_items:ongen_small", {
description = S("On-generation cloud"),
tiles = {"default_cloud.png"},
light_source = 2,
is_ground_content = false,
groups = {cracky = 1, level = 3, not_in_creative_inventory = 1},
drop = "",
sounds = default.node_sound_stone_defaults(),
on_place = function(itemstack, user, pointed_thing)
minetest.chat_send_player(user:get_player_name(), "You're not allowed to place on-generation cloud blocks!")
return itemstack
end,
})
minetest.register_node("cloud_items:ongen_medium", {
description = S("On-generation cloud"),
tiles = {"default_cloud.png"},
light_source = 2,
is_ground_content = false,
groups = {cracky = 1, level = 3, not_in_creative_inventory = 1},
drop = "",
sounds = default.node_sound_stone_defaults(),
on_place = function(itemstack, user, pointed_thing)
minetest.chat_send_player(user:get_player_name(), "You're not allowed to place on-generation cloud blocks!")
return itemstack
end,
})
minetest.register_node("cloud_items:ongen_big", {
description = S("On-generation cloud"),
tiles = {"default_cloud.png"},
light_source = 2,
is_ground_content = false,
groups = {cracky = 1, level = 3, not_in_creative_inventory = 1},
drop = "",
sounds = default.node_sound_stone_defaults(),
on_place = function(itemstack, user, pointed_thing)
minetest.chat_send_player(user:get_player_name(), "You're not allowed to place on-generation cloud blocks!")
return itemstack
end,
})
------------
-- Stairs --
------------
@ -202,6 +246,53 @@ local function place_schem_metadata(origin, filename)
minetest.log("action", "Successfully placed schematic with " .. nodes .. " nodes (metadata)")
end
-- When an schematic is generated, it'll have a special node
-- which will have certain chance to convert to an ore or normal cloud.
local chance = math.random(1, 100)
minetest.register_lbm({
label = "Replace cloud nodes with ore if succeeded",
name = "cloud_items:chance_add_ore",
nodenames = {"cloud_items:ongen_small", "cloud_items:ongen_medium", "cloud_items:ongen_big"},
run_at_every_load = true,
action = function(pos, node)
chance = math.random(1, 100)
if node.name == "cloud_items:ongen_small" then
if chance < 2.5 then
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud_ore"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with cloud ore.")
else
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with normal cloud.")
end
elseif node.name == "cloud_items:ongen_medium" then
if chance < 5 then
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud_ore"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with cloud ore.")
else
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with normal cloud.")
end
elseif node.name == "cloud_items:ongen_big" then
if chance < 7.5 then
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud_ore"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with cloud ore.")
else
minetest.remove_node(pos)
minetest.add_node(pos, {name="cloud_items:cloud"})
minetest.log("action", "cloud_items: Replaced on-generation cloud with normal cloud.")
end
end
end,
})
--[[
Functions from Minetest Game's nyancat (LGPLv2.1+).
@ -231,30 +322,6 @@ local function generate_small(minp, maxp, seed)
end
end
-- Generate the small schematic without the ore. 🤭
-- There are more chances to find an small schematic without an ore.
local function generate_small_without_ore(minp, maxp, seed)
local height_min = 200
local height_max = 1500
if maxp.y < height_min or minp.y > height_max then
return
end
local y_min = math.max(minp.y, height_min)
local y_max = math.min(maxp.y, height_max)
local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
local pr = PseudoRandom(seed + 9324342)
local max_num_schematics = math.floor(volume / (30 * 30 * 30))
for i = 1, max_num_schematics do
if pr:next(0, 1000) == 0 then
local x0 = pr:next(minp.x, maxp.x)
local y0 = pr:next(minp.y, maxp.y)
local z0 = pr:next(minp.z, maxp.z)
local p0 = {x = x0, y = y0, z = z0}
place_schem(p0, "cloud_small_2.we")
end
end
end
-- Medium.
local function generate_medium(minp, maxp, seed)
local height_min = 380
@ -278,29 +345,6 @@ local function generate_medium(minp, maxp, seed)
end
end
-- Medium (without ore).
local function generate_medium_without_ore(minp, maxp, seed)
local height_min = 380
local height_max = 1680
if maxp.y < height_min or minp.y > height_max then
return
end
local y_min = math.max(minp.y, height_min)
local y_max = math.min(maxp.y, height_max)
local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
local pr = PseudoRandom(seed + 9324342)
local max_num_schematics = math.floor(volume / (38 * 38 * 38))
for i = 1, max_num_schematics do
if pr:next(0, 1000) == 0 then
local x0 = pr:next(minp.x, maxp.x)
local y0 = pr:next(minp.y, maxp.y)
local z0 = pr:next(minp.z, maxp.z)
local p0 = {x = x0, y = y0, z = z0}
place_schem(p0, "cloud_medium_2.we")
end
end
end
-- Big.
local function generate_big(minp, maxp, seed)
local height_min = 580
@ -324,30 +368,7 @@ local function generate_big(minp, maxp, seed)
end
end
-- Big (without ore).
local function generate_big_without_ore(minp, maxp, seed)
local height_min = 580
local height_max = 1880
if maxp.y < height_min or minp.y > height_max then
return
end
local y_min = math.max(minp.y, height_min)
local y_max = math.min(maxp.y, height_max)
local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
local pr = PseudoRandom(seed + 9324342)
local max_num_schematics = math.floor(volume / (46 * 46 * 46))
for i = 1, max_num_schematics do
if pr:next(0, 1000) == 0 then
local x0 = pr:next(minp.x, maxp.x)
local y0 = pr:next(minp.y, maxp.y)
local z0 = pr:next(minp.z, maxp.z)
local p0 = {x = x0, y = y0, z = z0}
place_schem(p0, "cloud_big_2.we")
end
end
end
-- Cloud house
-- Cloud house.
local function generate_cloud_house(minp, maxp, seed)
local height_min = 1500
local height_max = 3750
@ -377,11 +398,8 @@ end
-- Generate/place the schematics.
minetest.register_on_generated(function(minp, maxp, seed)
generate_small(minp, maxp, seed)
generate_small_without_ore(minp, maxp, seed)
generate_medium(minp, maxp, seed)
generate_medium_without_ore(minp, maxp, seed)
generate_big(minp, maxp, seed)
generate_big_without_ore(minp, maxp, seed)
generate_cloud_house(minp, maxp, seed)
end)
@ -571,6 +589,8 @@ local car_def = {
passenger3_attach_at = {x=-4,y=3.7,z=-3.5},
passenger3_eye_offset = {x=4, y=3, z=0},
enable_crash = false,
drop_on_destroy = {"vehicle_mash:tire 2", "vehicle_mash:windshield",
"vehicle_mash:battery", "vehicle_mash:motor"},
}
@ -723,6 +743,25 @@ if minetest.get_modpath("3d_armor") then
})
end
-- Support for 3D Armor Gloves/Gauntlets
if minetest.get_modpath("3d_armor_gloves") then
armor:register_armor("cloud_items:gloves_cloud", {
description = S("Cloud Gauntlets"),
inventory_image = "cloud_items_inv_gloves_cloud.png",
groups = {armor_hands=1, armor_heal=12, armor_use=70},
armor_groups = {fleshy=10},
damage_groups = {cracky=2, snappy=1, level=6},
})
minetest.register_craft({
output = "cloud_items:gloves_cloud",
recipe = {
{"cloud_items:cloud_ingot", "", "cloud_items:cloud_ingot"},
{"farming:string", "", "farming:string"},
},
})
end
---------------
-- Crafting --
---------------

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage decorativa
Decorative cloud Stairs=Escalera de nube decorativa
Cloud multitool=Multiherramienta de nube
Cloud car=Carro de nube
Cloud Gauntlets=Guanteletes de nube

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage décoratif
Decorative cloud Stairs=Escaliers en nuage décoratif
Cloud multitool=Outil-multi nuage
Cloud car=Voiture de nuage
Cloud Gauntlets=Gantelets de nuage.

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=
Decorative cloud Stairs=
Cloud multitool=
Cloud car=
Cloud Gauntlets=

View file

@ -1,6 +1,6 @@
name = cloud_items
depends = default, worldedit, vehicle_mash
optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools
optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools, 3d_armor_gloves
description = Adds powerful cloud tools for Minetest.
min_minetest_version = 5.0.0
license = LGPLv2.1

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 397 B

View file

@ -0,0 +1,46 @@
# textdomain: currency
# author: PsycoJaker
### barter.lua ###
Barter Table=Mesa de intercambios
Cancel=Denegar
Confirm=Aceptar
Start=Intercambiar
### shop.lua ###
Exchange=Trato
### craftitems.lua ###
@1 Minegeld Note=Billete de @1 Minegeld
@1 Minegeld cent coin= Moneda de @1 Minegeld
Bundle of random Minegeld notes=Monton de dinero
### safe.lua ###
Safe=Caja fuerte
Safe (owned by @1)=Caja fuerte de @1
### shop.lua ###
Customer gets:=Tu compra:
Customer gives (pay here!)=Paga aqui
Customers gave:=Los compradores ofrecieron:
Exchange can not be done, check if you put all items!=La compra ha fallado, comprueba tu pago
Exchange can not be done, contact the shop owner.=La compra ha fallado, comunicate con el vendedor
Exchange shop (owned by @1)=Tienda de @1
Exchanged!=Comprado
In exchange, you give:=Vendes:
out of stock=Sin exsitencias
Owner gives:=Vendedor ofrece:
Owner wants:=Vendedor pide:
Owner, Use (E)+Place (right mouse button) for customer interface=Usa, las teclas (especial + boton derecho del raton) para ver a la interfaz del comprador
Shop=Tienda
This is your own shop, you can't exchange to yourself!=No puedes comprar en tu propia tienda
You want:=Tu pides:
Your stock:=Tus existencias:

4
mods/doors/mod.conf Normal file
View file

@ -0,0 +1,4 @@
name = doors
depends = default
optional_depends = screwdriver
description = Replaces default doors and adds protection support with switching key.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 751 B

View file

@ -1,86 +1,81 @@
# Blender v2.69 (sub 0) OBJ File: ''
# www.blender.org
mtllib computer_laptop.mtl
o Cube.001
v -0.340277 0.022636 0.335290
v -0.340277 0.013075 0.362499
v 0.332320 0.022636 0.335292
v 0.332320 -0.432772 0.182772
v 0.332320 0.013075 0.362501
v -0.340276 -0.499994 -0.312651
v -0.340276 -0.432772 -0.312651
v 0.332321 -0.499994 -0.312650
v -0.340277 -0.499994 0.182771
v 0.332320 -0.499994 0.182772
v -0.340277 -0.432772 0.182771
v -0.340278 -0.432772 0.209979
v 0.332320 -0.432772 0.209981
v 0.332320 -0.499994 0.209981
v -0.340278 -0.499994 0.209979
v -0.319957 -0.417924 0.194820
v -0.319957 -0.001053 0.334433
v 0.312000 -0.417925 0.194821
v -0.340277 -0.432772 -0.159321
v 0.332321 -0.432772 -0.312650
v 0.311999 -0.001054 0.334434
v 0.332321 -0.432772 -0.159320
vt 0.682604 0.005242
vt 0.682603 0.021207
vt 0.310265 0.005245
vt 0.044426 0.009206
vt 0.310266 0.021211
vt 0.753340 0.119988
vt 0.810356 0.119988
vt 0.753340 0.597765
vt 0.856851 0.982221
vt 0.745750 0.982220
vt 0.856851 0.831387
vt 0.948453 0.009205
vt 0.878028 0.982221
vt 0.878028 0.831387
vt 0.983700 0.982221
vt 0.862953 0.831387
vt 0.862953 0.982221
vt 0.728292 0.490807
vt 0.728292 0.989869
vt 0.010900 0.490807
vt 0.831643 0.129995
vt 0.982007 0.129995
vt 0.831643 0.789586
vt 0.758249 0.754841
vt 0.758228 0.812823
vt 0.756060 0.752868
vt 0.798519 0.812617
vt 0.756052 0.814797
vt 0.798577 0.754909
vt 0.800285 0.814587
vt 0.707729 0.114386
vt 0.707729 0.471212
vt 0.006162 0.114385
vt 0.345650 0.099088
vt 0.497058 0.032709
vt 0.497058 0.099088
vt 0.990661 0.099453
vt 0.838275 0.032645
vt 0.990661 0.032645
vt 0.007709 0.008663
vt 0.012705 0.022873
vt 0.983559 0.009737
vt 0.943457 0.023414
vt 0.049421 0.023416
vt 0.810356 0.597766
vt 0.745750 0.831387
vt 0.983700 0.831387
vt 0.010900 0.989869
vt 0.982007 0.789586
vt 0.800332 0.752938
vt 0.006162 0.471212
vt 0.007844 0.099088
vt 0.007844 0.032709
vt 0.498289 0.099453
vt 0.498289 0.032646
vt 0.978563 0.023946
usemtl Material.001
v -0.34 0.023 0.335
v -0.34 0.013 0.362
v 0.332 0.023 0.335
v 0.332 -0.433 0.183
v 0.332 0.013 0.363
v -0.34 -0.5 -0.313
v -0.34 -0.433 -0.313
v 0.332 -0.5 -0.313
v -0.34 -0.5 0.183
v 0.332 -0.5 0.183
v -0.34 -0.433 0.183
v -0.34 -0.433 0.21
v 0.332 -0.433 0.21
v 0.332 -0.5 0.21
v -0.34 -0.5 0.21
v -0.32 -0.418 0.195
v -0.32 -0.001 0.334
v 0.312 -0.418 0.195
v -0.34 -0.433 -0.159
v 0.332 -0.433 -0.313
v 0.312 -0.001 0.334
v 0.332 -0.433 -0.159
vt 0.683 0.005
vt 0.683 0.021
vt 0.31 0.005
vt 0.044 0.009
vt 0.31 0.021
vt 0.753 0.12
vt 0.81 0.12
vt 0.753 0.598
vt 0.857 0.982
vt 0.746 0.982
vt 0.857 0.831
vt 0.948 0.009
vt 0.878 0.982
vt 0.878 0.831
vt 0.984 0.982
vt 0.863 0.831
vt 0.863 0.982
vt 0.728 0.491
vt 0.728 0.99
vt 0.011 0.491
vt 0.832 0.13
vt 0.982 0.13
vt 0.832 0.79
vt 0.758 0.755
vt 0.758 0.813
vt 0.756 0.753
vt 0.799 0.813
vt 0.756 0.815
vt 0.799 0.755
vt 0.8 0.815
vt 0.708 0.114
vt 0.708 0.471
vt 0.006 0.114
vt 0.346 0.099
vt 0.497 0.033
vt 0.497 0.099
vt 0.991 0.099
vt 0.838 0.033
vt 0.991 0.033
vt 0.008 0.009
vt 0.013 0.023
vt 0.984 0.01
vt 0.943 0.023
vt 0.049 0.023
vt 0.81 0.598
vt 0.746 0.831
vt 0.984 0.831
vt 0.011 0.99
vt 0.982 0.79
vt 0.8 0.753
vt 0.006 0.471
vt 0.008 0.099
vt 0.008 0.033
vt 0.498 0.099
vt 0.498 0.033
vt 0.979 0.024
s off
f 1/1 2/2 3/3
f 4/4 3/3 5/5

View file

@ -1,98 +1,93 @@
# Blender v2.69 (sub 0) OBJ File: ''
# www.blender.org
mtllib computer_laptop_closed.mtl
o Cube.001
v 0.332320 -0.432772 0.182772
v -0.340276 -0.499994 -0.312651
v -0.340276 -0.432772 -0.312651
v 0.332321 -0.499994 -0.312650
v -0.340277 -0.499994 0.182771
v 0.332320 -0.499994 0.182772
v -0.340277 -0.432772 0.182771
v -0.340278 -0.432772 0.209979
v 0.332320 -0.432772 0.209981
v 0.332320 -0.499994 0.209981
v -0.340278 -0.499994 0.209979
v -0.340277 -0.432772 -0.159321
v 0.332321 -0.432772 -0.312650
v 0.332321 -0.432772 -0.159320
v -0.339100 -0.432290 -0.312591
v -0.339100 -0.401111 -0.312123
v 0.331143 -0.432288 -0.312592
v 0.331143 -0.432434 0.206702
v 0.331143 -0.401109 -0.312123
v -0.339100 -0.432435 0.206702
v -0.339101 -0.404537 0.197368
v 0.331143 -0.404535 0.197367
v -0.318852 -0.425175 0.187344
v -0.318852 -0.425042 -0.288007
v 0.310895 -0.425173 0.187344
v 0.310894 -0.425040 -0.288006
vt 0.753340 0.119988
vt 0.810356 0.119988
vt 0.753340 0.597765
vt 0.856851 0.982221
vt 0.745750 0.982220
vt 0.856851 0.831387
vt 0.878028 0.831387
vt 0.878028 0.982221
vt 0.862953 0.831387
vt 0.862953 0.982221
vt 0.858063 0.829423
vt 0.885587 0.829423
vt 0.858063 0.950158
vt 0.935597 0.852882
vt 0.935597 0.922715
vt 0.798294 0.852882
vt 0.345650 0.099088
vt 0.497058 0.032709
vt 0.497058 0.099088
vt 0.990661 0.099453
vt 0.838275 0.032645
vt 0.990661 0.032645
vt 0.007709 0.008663
vt 0.044426 0.009206
vt 0.012705 0.022873
vt 0.948453 0.009205
vt 0.983559 0.009737
vt 0.943457 0.023414
vt 0.810356 0.597766
vt 0.745750 0.831387
vt 0.885587 0.950158
vt 0.912135 0.962581
vt 0.785835 0.838012
vt 0.886333 0.908011
vt 0.922048 0.840165
vt 0.798294 0.922715
vt 0.007844 0.099088
vt 0.007844 0.032709
vt 0.498289 0.099453
vt 0.498289 0.032646
vt 0.049421 0.023416
vt 0.978563 0.023946
vt 0.682604 0.005242
vt 0.682603 0.021207
vt 0.310265 0.005245
vt 0.310266 0.021211
vt 0.983700 0.982221
vt 0.922420 0.868181
vt 0.922420 0.951695
vt 0.802372 0.868181
vt 0.758249 0.754841
vt 0.758228 0.812823
vt 0.756060 0.752868
vt 0.798519 0.812617
vt 0.756052 0.814797
vt 0.798577 0.754909
vt 0.800285 0.814587
vt 0.983700 0.831387
vt 0.802372 0.951695
vt 0.800332 0.752938
vt 0.896350 0.948981
vt 0.903598 0.848845
vt 0.888354 0.925385
vt 0.811076 0.850308
usemtl Material.001
v 0.332 -0.433 0.183
v -0.34 -0.5 -0.313
v -0.34 -0.433 -0.313
v 0.332 -0.5 -0.313
v -0.34 -0.5 0.183
v 0.332 -0.5 0.183
v -0.34 -0.433 0.183
v -0.34 -0.433 0.21
v 0.332 -0.433 0.21
v 0.332 -0.5 0.21
v -0.34 -0.5 0.21
v -0.34 -0.433 -0.159
v 0.332 -0.433 -0.313
v 0.332 -0.433 -0.159
v -0.339 -0.432 -0.313
v -0.339 -0.401 -0.312
v 0.331 -0.432 -0.313
v 0.331 -0.432 0.207
v 0.331 -0.401 -0.312
v -0.339 -0.432 0.207
v -0.339 -0.405 0.197
v 0.331 -0.405 0.197
v -0.319 -0.425 0.187
v -0.319 -0.425 -0.288
v 0.311 -0.425 0.187
v 0.311 -0.425 -0.288
vt 0.753 0.12
vt 0.81 0.12
vt 0.753 0.598
vt 0.857 0.982
vt 0.746 0.982
vt 0.857 0.831
vt 0.878 0.831
vt 0.878 0.982
vt 0.863 0.831
vt 0.863 0.982
vt 0.858 0.829
vt 0.886 0.829
vt 0.858 0.95
vt 0.936 0.853
vt 0.936 0.923
vt 0.798 0.853
vt 0.346 0.099
vt 0.497 0.033
vt 0.497 0.099
vt 0.991 0.099
vt 0.838 0.033
vt 0.991 0.033
vt 0.008 0.009
vt 0.044 0.009
vt 0.013 0.023
vt 0.948 0.009
vt 0.984 0.01
vt 0.943 0.023
vt 0.81 0.598
vt 0.746 0.831
vt 0.886 0.95
vt 0.912 0.963
vt 0.786 0.838
vt 0.886 0.908
vt 0.922 0.84
vt 0.798 0.923
vt 0.008 0.099
vt 0.008 0.033
vt 0.498 0.099
vt 0.498 0.033
vt 0.049 0.023
vt 0.979 0.024
vt 0.683 0.005
vt 0.683 0.021
vt 0.31 0.005
vt 0.31 0.021
vt 0.984 0.982
vt 0.922 0.868
vt 0.922 0.952
vt 0.802 0.868
vt 0.758 0.755
vt 0.758 0.813
vt 0.756 0.753
vt 0.799 0.813
vt 0.756 0.815
vt 0.799 0.755
vt 0.8 0.815
vt 0.984 0.831
vt 0.802 0.952
vt 0.8 0.753
vt 0.896 0.949
vt 0.904 0.849
vt 0.888 0.925
vt 0.811 0.85
s off
f 2/1 3/2 4/3
f 5/4 2/5 6/6

File diff suppressed because it is too large Load diff

View file

@ -1,29 +1,24 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
mtllib computer_tower.mtl
o Cube.001
v -0.182508 -0.499998 0.450000
v -0.182508 -0.499998 -0.349946
v 0.182508 -0.499998 -0.349946
v 0.182508 -0.499998 0.450000
v -0.182508 0.335734 0.450000
v 0.182508 0.335734 0.450000
v 0.182508 0.335734 -0.349946
v -0.182508 0.335734 -0.349947
vt 0.999994 0.750017
vt 0.500006 0.749983
vt 0.500002 0.499996
vt 0.999997 0.500009
vt 0.499989 0.999941
vt 0.999986 0.999931
vt 0.500005 0.000003
vt 0.000007 0.500002
vt -0.000003 0.000003
vt 0.250005 0.999991
vt 0.250005 0.499995
vt 0.999993 0.000002
vt 0.000017 0.999997
usemtl Material.001
v -0.183 -0.5 0.45
v -0.183 -0.5 -0.35
v 0.183 -0.5 -0.35
v 0.183 -0.5 0.45
v -0.183 0.336 0.45
v 0.183 0.336 0.45
v 0.183 0.336 -0.35
v -0.183 0.336 -0.35
vt 1 0.75
vt 0.5 0.75
vt 0.5 0.5
vt 1 0.5
vt 0.5 1
vt 1 1
vt 0.5 0
vt 0 0.5
vt 0 0
vt 0.25 1
vt 0.25 0.5
vt 1 0
vt 0 1
s off
f 1/1 2/2 3/3 4/4
f 5/5 6/2 7/1 8/6

View file

@ -1,129 +1,123 @@
# Blender v2.66 (sub 1) OBJ File: ''
# www.blender.org
mtllib tetris_arcade.mtl
o Cube.001
v -0.450000 1.299500 -0.450000
v -0.450000 1.299500 -0.500000
v 0.450000 1.299500 -0.500000
v 0.450000 1.299500 -0.450000
v -0.450000 1.499500 -0.450000
v -0.450000 1.499500 -0.500000
v 0.450000 1.499500 -0.500000
v 0.450000 1.499500 -0.450000
v 0.450000 -0.495000 -0.500000
v 0.450000 0.305000 -0.500001
v -0.450000 -0.495000 -0.499999
v -0.450000 0.305000 -0.500000
v 0.450000 -0.498500 0.500000
v 0.450000 -0.498500 -0.500000
v 0.500000 -0.498500 -0.500000
v 0.500000 -0.498500 0.500000
v 0.450000 1.498500 0.500000
v 0.450000 1.498500 -0.500000
v 0.500000 1.498500 -0.500000
v 0.500000 1.498500 0.500000
v 0.499998 -0.499998 -0.499998
v 0.499998 -0.499998 0.499998
v -0.499998 -0.499998 0.499998
v -0.499998 -0.499998 -0.499998
v 0.499998 1.499994 -0.499998
v -0.499998 1.499994 -0.499998
v -0.499998 1.499994 0.499998
v 0.499998 1.499994 0.499998
v -0.500000 -0.498500 0.500000
v -0.500000 -0.498500 -0.500000
v -0.450000 -0.498500 -0.500000
v -0.450000 -0.498500 0.500000
v -0.500000 1.498500 0.500000
v -0.500000 1.498500 -0.500000
v -0.450000 1.498500 -0.500000
v -0.450000 1.498500 0.500000
v 0.450000 0.304976 -0.499762
v 0.450000 0.474024 -0.137239
v -0.450000 0.304976 -0.499761
v -0.450000 0.474024 -0.137238
v 0.450000 0.472946 -0.138083
v 0.450000 0.613900 -0.086780
v -0.450000 0.472946 -0.138082
v -0.450000 0.613900 -0.086779
v 0.450000 0.610884 -0.085130
v 0.450000 1.398731 0.053788
v -0.450000 0.610884 -0.085130
v -0.450000 1.398731 0.053789
v 0.450000 1.395000 0.055138
v 0.450000 1.495000 0.055138
v -0.450000 1.395000 0.055138
v -0.450000 1.495000 0.055138
vt 0.250108 0.745030
vt 0.250224 0.516409
vt 0.494888 0.516008
vt 0.495027 0.744660
vt 0.500090 0.744658
vt 0.250080 0.744698
vt 0.250023 0.693307
vt 0.500163 0.693337
vt 0.244872 0.999900
vt 0.000100 0.999900
vt 0.000100 0.925965
vt 0.244701 0.925965
vt -0.000234 0.985285
vt 0.246386 0.985398
vt 0.246568 0.999900
vt 0.254685 0.396330
vt 0.255312 0.252326
vt 0.489851 0.252497
vt 0.489923 0.396494
vt 0.746604 0.251526
vt 1.000599 0.251553
vt 1.000481 0.749319
vt 0.748216 0.749150
vt 0.971448 0.251053
vt 0.999396 0.251108
vt 1.000262 0.749144
vt 0.972149 0.748806
vt 0.250110 0.749633
vt 0.000464 0.749633
vt 0.001279 0.251648
vt 0.250023 0.251690
vt 0.742499 0.744632
vt 0.500700 0.744632
vt 0.500700 0.255368
vt 0.742499 0.255368
vt 0.951737 0.252687
vt 0.999900 0.252686
vt 0.999900 0.748679
vt 0.951737 0.748679
vt 1.000029 0.749233
vt 0.744529 0.749104
vt 0.745177 0.251367
vt 1.001019 0.251067
vt 0.255742 0.485017
vt 0.255492 0.401623
vt 0.494936 0.401277
vt 0.495186 0.485021
vt 0.260753 0.515705
vt 0.260629 0.484664
vt 0.494387 0.484878
vt 0.494282 0.515673
vt -0.000037 0.745106
vt 0.000017 0.703328
vt 0.245542 0.703882
vt 0.245632 0.745399
vt 0.250050 0.250050
vt 0.000100 0.250050
vt 0.000100 0.000100
vt 0.250050 0.000100
vt 0.250050 0.749950
vt 0.250050 0.999900
vt 0.000100 0.749950
vt 0.999900 0.250049
vt 0.999900 0.749949
vt 0.749950 0.749950
vt 0.749950 0.250050
usemtl Material.001
v -0.45 1.3 -0.45
v -0.45 1.3 -0.5
v 0.45 1.3 -0.5
v 0.45 1.3 -0.45
v -0.45 1.5 -0.45
v -0.45 1.5 -0.5
v 0.45 1.5 -0.5
v 0.45 1.5 -0.45
v 0.45 -0.495 -0.5
v 0.45 0.305 -0.5
v -0.45 -0.495 -0.5
v -0.45 0.305 -0.5
v 0.45 -0.498 0.5
v 0.45 -0.498 -0.5
v 0.5 -0.498 -0.5
v 0.5 -0.498 0.5
v 0.45 1.499 0.5
v 0.45 1.499 -0.5
v 0.5 1.499 -0.5
v 0.5 1.499 0.5
v 0.5 -0.5 -0.5
v 0.5 -0.5 0.5
v -0.5 -0.5 0.5
v -0.5 -0.5 -0.5
v 0.5 1.5 -0.5
v -0.5 1.5 -0.5
v -0.5 1.5 0.5
v 0.5 1.5 0.5
v -0.5 -0.498 0.5
v -0.5 -0.498 -0.5
v -0.45 -0.498 -0.5
v -0.45 -0.498 0.5
v -0.5 1.499 0.5
v -0.5 1.499 -0.5
v -0.45 1.499 -0.5
v -0.45 1.499 0.5
v 0.45 0.305 -0.5
v 0.45 0.474 -0.137
v -0.45 0.305 -0.5
v -0.45 0.474 -0.137
v 0.45 0.473 -0.138
v 0.45 0.614 -0.087
v -0.45 0.473 -0.138
v -0.45 0.614 -0.087
v 0.45 0.611 -0.085
v 0.45 1.399 0.054
v -0.45 0.611 -0.085
v -0.45 1.399 0.054
v 0.45 1.395 0.055
v 0.45 1.495 0.055
v -0.45 1.395 0.055
v -0.45 1.495 0.055
vt 0.25 0.745
vt 0.25 0.516
vt 0.495 0.516
vt 0.495 0.745
vt 0.5 0.745
vt 0.25 0.745
vt 0.25 0.693
vt 0.5 0.693
vt 0.245 1
vt 0 1
vt 0 0.926
vt 0.245 0.926
vt 0 0.985
vt 0.246 0.985
vt 0.247 1
vt 0.255 0.396
vt 0.255 0.252
vt 0.49 0.252
vt 0.49 0.396
vt 0.747 0.252
vt 1.001 0.252
vt 1 0.749
vt 0.748 0.749
vt 0.971 0.251
vt 0.999 0.251
vt 1 0.749
vt 0.972 0.749
vt 0.25 0.75
vt 0 0.75
vt 0.001 0.252
vt 0.25 0.252
vt 0.742 0.745
vt 0.501 0.745
vt 0.501 0.255
vt 0.742 0.255
vt 0.952 0.253
vt 1 0.253
vt 1 0.749
vt 0.952 0.749
vt 1 0.749
vt 0.745 0.749
vt 0.745 0.251
vt 1.001 0.251
vt 0.256 0.485
vt 0.255 0.402
vt 0.495 0.401
vt 0.495 0.485
vt 0.261 0.516
vt 0.261 0.485
vt 0.494 0.485
vt 0.494 0.516
vt 0 0.745
vt 0 0.703
vt 0.246 0.704
vt 0.246 0.745
vt 0.25 0.25
vt 0 0.25
vt 0 0
vt 0.25 0
vt 0.25 0.75
vt 0.25 1
vt 0 0.75
vt 1 0.25
vt 1 0.75
vt 0.75 0.75
vt 0.75 0.25
s off
f 46/1 45/2 47/3 48/4
usemtl Material.001_tetris_arcade.png
f 6/5 7/6 3/7 2/8
f 8/9 5/10 1/11 4/12
f 1/10 2/13 3/14 4/15
@ -137,7 +131,6 @@ f 35/40 36/41 32/42 31/43
f 38/44 37/45 39/46 40/47
f 42/48 41/49 43/50 44/51
f 50/52 49/53 51/54 52/55
usemtl Material.001_NONE
f 21/56 22/57 23/58 24/59
f 25/60 26/61 27/10 28/62
f 22/63 28/64 27/65 23/66

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 67 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 102 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 B

After

Width:  |  Height:  |  Size: 76 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 89 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 B

After

Width:  |  Height:  |  Size: 80 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

After

Width:  |  Height:  |  Size: 80 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 153 B

Some files were not shown because too many files have changed in this diff Show more