minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2024-11-13 05:50:41 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into pandorabox

Browse Source
This commit is contained in:
NatureFreshMilk 2019-11-04 08:25:37 +01:00
commit 98db7d203a
19 changed files with 80 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
concrete/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = concrete
depends = default
optional_depends = basic_materials, intllib, moreblocks

3
extranodes/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = extranodes
depends = default, technic_worldgen, basic_materials, concrete
optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod

1
modpack.conf Normal file
View File

@ -0,0 +1 @@
name = technic

1
modpack.txt
View File

@ -1 +0,0 @@

5
technic/helpers.lua
View File

@ -91,8 +91,8 @@ end
technic.tube_inject_item = pipeworks.tube_inject_item or function(pos, start_pos, velocity, item)
local tubed = pipeworks.tube_item(vector.new(pos), item)
tubed:get_luaentity().start_pos = vector.new(start_pos)
tubed:setvelocity(velocity)
tubed:setacceleration(vector.new(0, 0, 0))
tubed:set_velocity(velocity)
tubed:set_acceleration(vector.new(0, 0, 0))
end
@ -221,4 +221,3 @@ function technic.trace_node_ray_fat(pos, dir, range)
return p
end, vector.round(pos)
end

52
technic/locale/fr.txt
View File

@ -8,30 +8,30 @@
Silicon Wafer = Tranche de silicium
Doped Silicon Wafer = Tranche de silicium doppée
Enriched Uranium = Uranium enrichi
Uranium Fuel = Carburant d'uranium
Diamond Drill Head = Tête de forage au diamant
Uranium Fuel = Uranium 235
Diamond Drill Head = Tête de forage en diamant
Blue Energy Crystal = Cristal d'énergie bleu
Green Energy Crystal = Cristal d'énergie vert
Red Energy Crystal = Cristal d'énergie rouge
Fine Copper Wire = Fil fin en cuivre
Fine Gold Wire = Fil fin en or
Fine Silver Wire = Fil fin en argent
Fine Copper Wire = Fil en cuivre fin
Fine Gold Wire = Fil en or fin
Fine Silver Wire = Fil en argent fin
Copper Coil = Bobine de cuivre
Electric Motor = Moteur électrique
Low Voltage Transformer = Transformateur basse tension
Medium Voltage Transformer = Transformateur moyenne tension
High Voltage Transformer = Transformateur haute tension
Control Logic Unit = Unité de contrôle logique
Mixed Metal Ingot = Lingot de métal mélangé
Mixed Metal Ingot = Lingot de métal allié
Composite Plate = Plaque composite
Copper Plate = Plaque de cuivre
Carbon Plate = Plaque de carbone
Graphite = Graphite
Carbon Cloth = Fibre de carbone
Raw Latex = Latex brut
Rubber Fiber = Fibre de latex
Rubber Fiber = Fibre de caoutchouc
%.1f%%-Fissile Uranium Ingot = Lingot d'uranium fissile (%.1f%%)
%.1f%%-Fissile Uranium Block = Block d'uranium fissile (%.1f%%)
%.1f%%-Fissile Uranium Block = Bloc d'uranium fissile (%.1f%%)
## Machine misc
Machine cannot be removed because it is not empty = La machine ne peut pas être retirée car elle n'est pas vide
@ -49,21 +49,21 @@ Inventory move disallowed due to protection = Le mouvement d'inventa
%s Out Of Fuel = %s plus de carburant
%s Has Bad Cabling = %s est mal cablé
%s (Slave) = %s (esclave)
%s Has No Network = %s n'est pas en réseau
%s Finished = %s finit
%s Has No Network = %s n'a pas de réseau
%s Finished = %s a fini
Enable/Disable = Activer/Désactiver
Range = Plage
Upgrade Slots = Emplacement d'amélioration
In: = Entrée :
Out: = Sortie :
Slot %d = Emplacement %d
Itemwise =
Stackwise =
Itemwise = Item par Item
Stackwise = Stack par Stack
Ignoring Mesecon Signal = Ignorer le signal Mesecon
Controlled by Mesecon Signal = Contrôlé par signal Mesecon
Owner: = Propriétaire :
Unlocked = Dévérouillé
Locked = Vérouillé
Unlocked = Déverrouillé
Locked = Verrouillé
Radius: = Rayon :
Enabled = Activé
Disabled = Désactivé
@ -80,13 +80,13 @@ Disabled = Désactivé
%s Forcefield Emitter = Emetteur de champ de force %s
%s Furnace = Four %s
%s Grinder = Broyeur %s
%s Music Player = Poste de musique %s
%s Quarry = Mineur %s
%s Music Player = Grammophone %s
%s Quarry = Carrière %s
%s Tool Workshop = Atelier d'outillage %s
Arrayed Solar %s Generator = Générateur solaire %s
Fuel-Fired %s Generator = Générateur à carburant
Fuel-Fired %s Generator = Générateur thermique %s
Geothermal %s Generator = Géénarteur géothermique %s
Hydro %s Generator = Générateur hydro %s
Hydro %s Generator = Générateur hydroélectrique %s
Nuclear %s Generator Core = Générateur nucléaire %
Small Solar %s Generator = Petit générateur solaire %s
Wind %s Generator = Générateur éolien %s
@ -99,7 +99,7 @@ Template (replacing) =
Template Motor =
Template Tool =
Battery Box = Compartiment à batterie
Supply Converter = Convertisseur d'alimentation
Supply Converter = Convertisseur de tension
Switching Station = Station de commutation
Fuel-Fired Alloy Furnace = Four à alliage à carburant
Fuel-Fired Furnace = Four à carburant
@ -168,7 +168,7 @@ Wooden = Bois
## Grinder Recipes
# $1: Name
%s Dust = Poudre - %s
%s Dust = Poudre de %s
Akalin =
Alatro =
Arol =
@ -185,7 +185,7 @@ Silver = Argent
Stainless Steel = Acier inoxydable
Talinite = Talanite
Tin = Etain
Wrought Iron = Fer forgé
Wrought Iron = Fer
Zinc = Zinc
%.1f%%-Fissile Uranium = Uranium fissile (%.1f%%)
@ -193,8 +193,8 @@ Zinc = Zinc
RE Battery = Batterie RE
Water Can = Jerrycan d'eau
Lava Can = Jerrycan de lave
Chainsaw = Trançonneuse
Flashlight = Lampe torche
Chainsaw = Tronçonneuse
Flashlight = Lampe-torche
3 nodes deep. =
3 nodes tall. =
3 nodes wide. =
@ -204,12 +204,12 @@ Mining Drill Mk%d Mode %d = Foreuse Mk%d Mode %d
Mining Drill Mk%d = Foreuse Mk%d
Mining Laser Mk%d = Foreuse laser Mk%d
Single node. = Mode simple.
Sonic Screwdriver = Tournevis sonique
Tree Tap = Taraud à latex
Sonic Screwdriver = Tournevis supersonique
Tree Tap = Robinet à sève
## Craft descriptions
Alloy cooking = Fonderie d'alliage
Grinding = Broyage
Compressing = Compression
Extracting = Extraction
Separating = Séparat
Separating = Séparation

18
technic/machines/other/frames.lua
View File

@ -155,7 +155,7 @@ local function move_nodes_vect(poslist, vect, must_not_move, owner)
end
for _, obj in ipairs(objects) do
obj:setpos(vector.add(obj:getpos(), vect))
obj:set_pos(vector.add(obj:get_pos(), vect))
end
for _, n in ipairs(nodelist) do
@ -276,7 +276,7 @@ for zp = 0, 1 do
end,
on_punch = function(pos, node, puncher)
local ppos = puncher:getpos()
local ppos = puncher:get_pos()
local pvect = puncher:get_look_dir()
local pface = get_face(pos, ppos, pvect)
@ -431,14 +431,14 @@ minetest.register_entity("technic:frame_entity", {
end,
dig = function(self)
minetest.handle_node_drops(self.object:getpos(), { ItemStack("technic:frame_111111") }, self.last_puncher)
local pos = vector.round(self.object:getpos())
minetest.handle_node_drops(self.object:get_pos(), { ItemStack("technic:frame_111111") }, self.last_puncher)
local pos = vector.round(self.object:get_pos())
frames_pos[pos_to_string(pos)] = nil
self.object:remove()
end,
on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir)
local pos = self.object:getpos()
local pos = self.object:get_pos()
if self.damage_object == nil then
self.damage_object = minetest.add_entity(pos, "technic:damage_entity")
self.damage_object:get_luaentity().remaining_time = 0.25
@ -450,7 +450,7 @@ minetest.register_entity("technic:frame_entity", {
end
self.last_puncher = puncher
local ppos = puncher:getpos()
local ppos = puncher:get_pos()
local pvect = puncher:get_look_dir()
local pface = get_face(pos, ppos, pvect)
if pface == nil then return end
@ -468,8 +468,8 @@ minetest.register_entity("technic:frame_entity", {
end,
on_rightclick = function(self, clicker)
local pos = self.object:getpos()
local ppos = clicker:getpos()
local pos = self.object:get_pos()
local ppos = clicker:get_pos()
local pvect = clicker:get_look_dir()
local pface = get_face(pos, ppos, pvect)
@ -547,7 +547,7 @@ mesecon.register_on_mvps_move(function(moved_nodes)
local entity = obj:get_luaentity()
if entity and (entity.name == "technic:frame_entity" or
entity.name == "technic:damage_entity") then
obj:setpos(t.pos)
obj:set_pos(t.pos)
end
end
end

3
technic/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = technic
depends = default, pipeworks, technic_worldgen, basic_materials
optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye

2
technic/radiation.lua
View File

@ -311,7 +311,7 @@ local function calculate_object_center(object)
end
local function dmg_object(pos, object, strength)
local obj_pos = vector.add(object:getpos(), calculate_object_center(object))
local obj_pos = vector.add(object:get_pos(), calculate_object_center(object))
local mul
if armor_enabled or entity_damage then
-- we need to check may the object be damaged even if armor is disabled

5
technic/tools/chainsaw.lua
View File

@ -3,7 +3,7 @@
local chainsaw_max_charge = 30000 -- Maximum charge of the saw
-- Gives 2500 nodes on a single charge (about 50 complete normal trees)
local chainsaw_charge_per_node = 12
local chainsaw_leaves = true -- Cut down tree leaves.
-- Leaf decay may cause slowness on large trees if this is disabled.
@ -132,7 +132,7 @@ local function recursive_dig(pos, remaining_charge)
handle_drops(minetest.get_node_drops(node.name, ""))
minetest.remove_node(pos)
remaining_charge = remaining_charge - chainsaw_charge_per_node
-- Check for snow on pine trees, etc
minetest.check_for_falling(pos)
@ -269,4 +269,3 @@ minetest.after(0, function ()
end
end
end)

6
technic/tools/flashlight.lua
View File

@ -55,7 +55,7 @@ end
minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name()
local pos = player:getpos()
local pos = player:get_pos()
local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1
player_positions[player_name] = rounded_pos
@ -77,7 +77,7 @@ minetest.register_globalstep(function(dtime)
for i, player in pairs(minetest.get_connected_players()) do
local player_name = player:get_player_name()
local flashlight_weared = check_for_flashlight(player)
local pos = player:getpos()
local pos = player:get_pos()
local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1
local old_pos = player_positions[player_name]
@ -113,7 +113,7 @@ minetest.register_node("technic:light", {
drawtype = "glasslike",
tiles = {"technic_light.png"},
paramtype = "light",
groups = {not_in_creative_inventory=1},
groups = {not_in_creative_inventory = 1},
drop = "",
walkable = false,
buildable_to = true,

2
technic/tools/mining_lasers.lua
View File

@ -59,7 +59,7 @@ local function can_keep_node(name)
end
local function laser_shoot(player, range, particle_texture, sound)
local player_pos = player:getpos()
local player_pos = player:get_pos()
local player_name = player:get_player_name()
local dir = player:get_look_dir()

2
technic/tools/prospector.lua
View File

@ -48,7 +48,7 @@ minetest.register_tool("technic:prospector", {
end
if math.random() < 0.02 then found = not found end
minetest.chat_send_player(user:get_player_name(), minetest.registered_nodes[toolmeta.target].description.." is "..(found and "present" or "absent").." in "..look_diameter.."x"..look_diameter.."x"..toolmeta.look_depth.." region")
minetest.sound_play("technic_prospector_"..(found and "hit" or "miss"), { pos = vector.add(user:getpos(), { x = 0, y = 1, z = 0 }), gain = 1.0, max_hear_distance = 10 })
minetest.sound_play("technic_prospector_"..(found and "hit" or "miss"), { pos = vector.add(user:get_pos(), { x = 0, y = 1, z = 0 }), gain = 1.0, max_hear_distance = 10 })
return toolstack
end,
on_place = function(toolstack, user, pointed_thing)

2
technic/tools/vacuum.lua
View File

@ -24,7 +24,7 @@ minetest.register_tool("technic:vacuum", {
gain = 0.4,
})
end
local pos = user:getpos()
local pos = user:get_pos()
local inv = user:get_inventory()
for _, object in ipairs(minetest.get_objects_inside_radius(pos, vacuum_range)) do
local luaentity = object:get_luaentity()

24
technic_chests/locale/fr.txt
View File

@ -1,18 +1,18 @@
# technic_chests translation template
%s Chest = Coffre en %s
%s Locked Chest = Coffre vérouillé en %s
%s Locked Chest (owned by %s) = Coffre vérouillé en %s (appartenant à %s)
%s Locked Chest = Coffre verrouillé en %s
%s Locked Chest (owned by %s) = Coffre verrouillé en %s (appartient à %s)
Color Filter: %s = Filtre couleur : %s
Edit chest description: = Editer la descrition du coffre
Edit chest description: = Editer la description du coffre
# Colors
Black = Noir
Blue = Bleu
Brown = Marron
Cyan = Cyan
Dark Green = Vert sombre
Dark Grey = Gris sombre
Dark Green = Vert foncé
Dark Grey = Gris foncé
Green = Vert
Grey = Gris
Magenta = Magenta
@ -25,15 +25,15 @@ Yellow = Jaune
None = Rien
# Materials
Copper = Cuivre
Gold = Or
Iron = Fer
Mithril = Mithril
Silver = Argent
Wooden = Bois
Copper = cuivre
Gold = or
Iron = fer
Mithril = mithril
Silver = argent
Wooden = bois
# Sorting
Sort = Tri
Auto-sort is %s = Tri automatique %s
Off = inactivé
Off = désactivé
On = activé

6
technic_chests/mod.conf
View File

@ -1,3 +1,3 @@
name=technic_chests
depends=default,basic_materials
optional_depends=moreblocks,moreores,pipeworks,intllib,tubelib
name = technic_chests
depends = default, basic_materials
optional_depends = moreblocks, moreores, pipeworks, intllib, tubelib

3
technic_cnc/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = technic_cnc
depends = default, basic_materials
optional_depends = technic

3
technic_worldgen/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = technic_worldgen
depends = default, basic_materials
optional_depends = intllib, mg, doors, farming, glooptest, mesecons_doors, vessels

3
wrench/mod.conf Normal file
View File

@ -0,0 +1,3 @@
name = wrench
depends = default
optional_depends = technic, technic_chests, technic_worldgen, intllib