mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-11-28 13:53:45 +01:00
Merge pull request 'master' (#1) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/1
This commit is contained in:
NO11
commit
ee749c874b
@ -1,3 +1,5 @@
|
||||
# (Currently in feature freeze)
|
||||
|
||||
# MineClone 2
|
||||
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
|
||||
Developed by many people. Not developed or endorsed by Mojang AB.
|
||||
|
||||
@ -1515,9 +1515,9 @@ local is_at_water_danger = function(self)
|
||||
end
|
||||
|
||||
local function get_light(pos, tod)
|
||||
if minetest.get_node_or_nil(pos) then
|
||||
local lightfunc = minetest.get_natural_light or minetest.get_node_light
|
||||
return lightfunc(pos, tod)
|
||||
local ok, light = pcall(minetest.get_natural_light or minetest.get_node_light, pos, tod)
|
||||
if ok then
|
||||
return light
|
||||
else
|
||||
return 0
|
||||
end
|
||||
@ -1646,6 +1646,8 @@ local do_env_damage = function(self)
|
||||
|
||||
self.health = self.health - self.lava_damage
|
||||
|
||||
mcl_burning.set_on_fire(self.object, 15)
|
||||
|
||||
effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
||||
|
||||
if check_for_death(self, "lava", {type = "environment",
|
||||
@ -1662,6 +1664,8 @@ local do_env_damage = function(self)
|
||||
|
||||
self.health = self.health - self.fire_damage
|
||||
|
||||
mcl_burning.set_on_fire(self.object, 8)
|
||||
|
||||
effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
||||
|
||||
if check_for_death(self, "fire", {type = "environment",
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
# Itemname (ca. 25%)
|
||||
@1 (ca. @2%)=@1 (ca. @2%)
|
||||
# List separator (e.g. “one, two, three”)
|
||||
, =,
|
||||
, =,
|
||||
# Final list separator (e.g. “One, two and three”)
|
||||
and = und
|
||||
and = und
|
||||
1 second=1 Sekunde
|
||||
A transparent block, basically empty space. It is usually left behind after digging something.=Ein transparenter Block, praktisch leerer Raum. Er wird üblicherweise hinterlassen, nachdem man etwas ausgegraben hat.
|
||||
Air=Luft
|
||||
@ -32,7 +32,7 @@ Item reference of items which are neither blocks, tools or weapons (esp. craftin
|
||||
Liquids can flow into this block and destroy it.=Flüssigkeiten können in diesen Block hereinfließen und ihn zerstören.
|
||||
Maximum stack size: @1=Maximale Stapelgröße: @1
|
||||
Mining level: @1=Grabestufe: @1
|
||||
Mining ratings:=Grabewertungen:
|
||||
Mining ratings:=Grabewertungen:
|
||||
• @1, rating @2: @3 s - @4 s=• @1, Wertung @2: @3 s - @4 s
|
||||
• @1, rating @2: @3 s=• @1, Wertung @2: @3 s
|
||||
Mining times:=Grabezeiten:
|
||||
@ -76,9 +76,8 @@ This block connects to these blocks: @1.=Dieser Block verbindet sich mit den fol
|
||||
This block connects to this block: @1.=Dieser Block verbindet sich mit diesem Block: @1.
|
||||
This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Dieser Block reduziert Ihren Atem und verursacht beim Ertrinken einen Schaden von @1 Trefferpunkt alle 2 Sekunden.
|
||||
This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Dieser Block reduziert Ihren Atem und verursacht beim Ertrinken einen Schaden von @1 Trefferpunkten alle 2 Sekunden.
|
||||
This block glows faintly. It is barely noticable.=Dieser Block leuchtet schwach. Es ist kaum merklich.
|
||||
This block is a light source with a light level of @1.=Dieser Block ist eine Lichtquelle mit einer Helligkeitsstufe von @1.
|
||||
This block glows faintly with a light level of @1.=Dieser Block leuchtet schwach mit einer Helligkeitsstufe von @1.
|
||||
This block glows faintly with a light level of @1.=Dieser Block leuchtet schwach mit einer Helligkeitsstufe von @1.
|
||||
This block is a building block for creating various buildings.=Dieser Block ist für den Bau diverser Gebäude vorgesehen.
|
||||
This block is a liquid with these properties:=Dieser Block ist eine Flüssigkeit mit folgenden Eigenschaften:
|
||||
This block is affected by gravity and can fall.=Dieser Block wird von der Schwerkraft beeinflusst und kann fallen.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
Using it as fuel turns it into: @1.=
|
||||
@1 seconds=
|
||||
# Item count times item name
|
||||
%@1×@2=
|
||||
@1×@2=
|
||||
# Itemname (25%)
|
||||
@1 (@2%)=
|
||||
# Itemname (<0.5%)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# textdomain:awards
|
||||
@1: @2=@1: @2
|
||||
@1 (got)=@1 (erhalten)
|
||||
@1’s awards:=Auszeichnungen von @1:
|
||||
@1’s awards:=Auszeichnungen von @:
|
||||
(Secret Award)=(Geheime Auszeichnung)
|
||||
Achievement gotten!=Auszeichnung erhalten!
|
||||
Achievement gotten:=Auszeichnung erhalten:
|
||||
@ -27,7 +27,6 @@ Awards=Auszeichnungen
|
||||
@1/@2 deaths=@1/@2 Tode
|
||||
@1/@2 dug=@1/@2 abgebaut
|
||||
@1/@2 game joins=@1/@2 Spielen beigetreten
|
||||
@1/@2 lines of chat=@1/@2 Chatzeilen
|
||||
@1/@2 placed=@1/@2 platziert
|
||||
Die @1 times.=Sterben Sie @1 mal.
|
||||
Die.=Sterben Sie.
|
||||
@ -58,3 +57,7 @@ Invalid action.=Ungültige Aktion.
|
||||
Player is not online.=Spieler ist nicht online.
|
||||
Done.=Fertig.
|
||||
Achievement “@1” does not exist.=Auszeichnung »@1« existiert nicht.
|
||||
@1 has made the achievement @2=@1 hat die Auszeichnung @2 erhalten
|
||||
Write something in chat.=Schreiben Sie etwas in den Chat.
|
||||
Write @1 chat messages.=Schreiben Sie @1 Chatnachrichten.
|
||||
@1/@2 chat messages=@1/@2 Chatnachrichten
|
||||
|
||||
@ -6,12 +6,11 @@
|
||||
@1/@2 game joins=
|
||||
@1/@2 placed=
|
||||
@1 (got)=
|
||||
@1: @1=
|
||||
@1: @2=
|
||||
@1’s awards:=
|
||||
(Secret Award)=
|
||||
<achievement ID>=
|
||||
<name>=
|
||||
A Cat in a Pop-Tart?!=
|
||||
Achievement gotten!=
|
||||
Achievement gotten:=
|
||||
Achievement gotten: @1=
|
||||
@ -28,9 +27,9 @@ Join the game.=
|
||||
List awards in chat (deprecated)=
|
||||
Place a block: @1=
|
||||
Place blocks: @1×@2=
|
||||
Secret Achievement gotten!=
|
||||
Secret Achievement gotten:=
|
||||
Secret Achievement gotten: @1=
|
||||
Secret achievement gotten!=
|
||||
Secret achievement gotten:=
|
||||
Secret achievement gotten: @1=
|
||||
Show details of an achievement=
|
||||
Show, clear, disable or enable your achievements=
|
||||
Get this achievement to find out what it is.=
|
||||
@ -60,3 +59,5 @@ Player is not online.=
|
||||
Done.=
|
||||
Achievement “@1” does not exist.=
|
||||
@1 has made the achievement @2=
|
||||
Mine a block: @1=
|
||||
Mine blocks: @1×@2=
|
||||
|
||||
@ -263,7 +263,7 @@ function mcl_experience.add_experience(player, experience)
|
||||
local can = final_candidates[math.random(#final_candidates)]
|
||||
local stack, list, index, wear = can.stack, can.list, can.index, can.wear
|
||||
local unbreaking_level = mcl_enchanting.get_enchantment(stack, "unbreaking")
|
||||
local uses = mcl_util.calculate_durability(itemstack)
|
||||
local uses = mcl_util.calculate_durability(stack)
|
||||
local multiplier = 2 * 65535 / uses
|
||||
local repair = experience * multiplier
|
||||
local new_wear = wear - repair
|
||||
|
||||
@ -24,7 +24,7 @@ Red Shulker Box=
|
||||
Grey Shulker Box=
|
||||
Black Shulker Box=
|
||||
A shulker box is a portable container which provides 27 inventory slots for any item except shulker boxes. Shulker boxes keep their inventory when broken, so shulker boxes as well as their contents can be taken as a single item. Shulker boxes come in many different colors.=
|
||||
To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out. Place the shulker box again to be able to retrieve its contents.=
|
||||
To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out.=
|
||||
Shulker Box=
|
||||
Large Chest=
|
||||
Inventory=
|
||||
|
||||
@ -274,3 +274,4 @@ Slows down movement=Verlangsamt die Fortbewegung
|
||||
2×2 saplings @= large tree=2×2 Setzlinge @= großer Baum
|
||||
Grows on sand or dirt next to water=Wächst auf Sand oder Erde neben Wasser
|
||||
Stackable=Stapelbar
|
||||
Needs soil and water to grow=Braucht Nährboden und Wasser zum wachsen
|
||||
|
||||
@ -689,7 +689,7 @@ function mcl_potions.healing_func(player, hp)
|
||||
hp = -1
|
||||
end
|
||||
|
||||
mcl_util.deal_damage(obj, -hp, {type = "magic"})
|
||||
mcl_util.deal_damage(player, -hp, {type = "magic"})
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -112,18 +112,3 @@ No effect=Keine Wirkung
|
||||
A throwable potion that will shatter on impact, where it gives all nearby players and mobs a status effect.=Ein werfbarer Trank, der bei Kollision zerbrechen wird, wo er allen nahen Spielern und Mobs einen Statuseffekt geben wird.
|
||||
|
||||
This particular arrow is tipped and will give an effect when it hits a player or mob.=Diese Pfeilspitze dieses Pfeils in einem Trank getränkt und gibt einen Effekt, wenn er einen Spieler oder einen Mob trifft.
|
||||
|
||||
|
||||
|
||||
##### not used anymore #####
|
||||
|
||||
Lingering Weakness Potion=Schwächeverweiltrank
|
||||
Lingering Weakness Potion +=Schwächeverweiltrank +
|
||||
Lingering Strength Potion=Stärkeverweiltrank
|
||||
Lingering Strength Potion II=Stärkeverweiltrank II
|
||||
Lingering Strength Potion +=Stärkeverweiltrank +
|
||||
Weakness Splash Potion=Schwächewurftrank
|
||||
Weakness Splash Potion +=Schwächewurftrank +
|
||||
Strength Splash Potion=Stärkewurftrank
|
||||
Strength Splash Potion II=Stärkewurftrank II
|
||||
Strength Splash Potion +=Stärkewurftrank +
|
||||
|
||||
Loading…
Reference in New Issue
Block a user