Skip to content

Commit 6940e5a

Browse files
updatepo.shsfan5
updatepo.sh
authored andcommittedApr 3, 2020
Update minetest.conf.example, settings_translation_file.cpp
1 parent 6588481 commit 6940e5a

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed
 

Diff for: ‎minetest.conf.example

+28-27
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@
13711371
# ask_reconnect_on_crash = false
13721372

13731373
# From how far clients know about objects, stated in mapblocks (16 nodes).
1374-
#
1374+
#
13751375
# Setting this larger than active_block_range will also cause the server
13761376
# to maintain active objects up to this distance in the direction the
13771377
# player is looking. (This can avoid mobs suddenly disappearing from view)
@@ -1920,7 +1920,7 @@
19201920
# octaves = 3,
19211921
# persistence = 0.5,
19221922
# lacunarity = 2.0,
1923-
# flags =
1923+
# flags =
19241924
# }
19251925

19261926
# Second of two 3D noises that together define tunnels.
@@ -1933,7 +1933,7 @@
19331933
# octaves = 3,
19341934
# persistence = 0.5,
19351935
# lacunarity = 2.0,
1936-
# flags =
1936+
# flags =
19371937
# }
19381938

19391939
# 3D noise defining giant caverns.
@@ -1946,7 +1946,7 @@
19461946
# octaves = 5,
19471947
# persistence = 0.63,
19481948
# lacunarity = 2.0,
1949-
# flags =
1949+
# flags =
19501950
# }
19511951

19521952
# 3D noise defining terrain.
@@ -1972,7 +1972,7 @@
19721972
# octaves = 2,
19731973
# persistence = 0.8,
19741974
# lacunarity = 2.0,
1975-
# flags =
1975+
# flags =
19761976
# }
19771977

19781978
## Mapgen V6
@@ -2312,7 +2312,7 @@
23122312
# octaves = 5,
23132313
# persistence = 0.63,
23142314
# lacunarity = 2.0,
2315-
# flags =
2315+
# flags =
23162316
# }
23172317

23182318
# 3D noise defining structure of river canyon walls.
@@ -2325,7 +2325,7 @@
23252325
# octaves = 4,
23262326
# persistence = 0.75,
23272327
# lacunarity = 2.0,
2328-
# flags =
2328+
# flags =
23292329
# }
23302330

23312331
# 3D noise defining giant caverns.
@@ -2338,7 +2338,7 @@
23382338
# octaves = 5,
23392339
# persistence = 0.63,
23402340
# lacunarity = 2.0,
2341-
# flags =
2341+
# flags =
23422342
# }
23432343

23442344
# First of two 3D noises that together define tunnels.
@@ -2351,7 +2351,7 @@
23512351
# octaves = 3,
23522352
# persistence = 0.5,
23532353
# lacunarity = 2.0,
2354-
# flags =
2354+
# flags =
23552355
# }
23562356

23572357
# Second of two 3D noises that together define tunnels.
@@ -2364,7 +2364,7 @@
23642364
# octaves = 3,
23652365
# persistence = 0.5,
23662366
# lacunarity = 2.0,
2367-
# flags =
2367+
# flags =
23682368
# }
23692369

23702370
# 3D noise that determines number of dungeons per mapchunk.
@@ -2377,7 +2377,7 @@
23772377
# octaves = 2,
23782378
# persistence = 0.8,
23792379
# lacunarity = 2.0,
2380-
# flags =
2380+
# flags =
23812381
# }
23822382

23832383
## Mapgen Carpathian
@@ -2620,7 +2620,7 @@
26202620
# octaves = 5,
26212621
# persistence = 0.55,
26222622
# lacunarity = 2.0,
2623-
# flags =
2623+
# flags =
26242624
# }
26252625

26262626
# First of two 3D noises that together define tunnels.
@@ -2633,7 +2633,7 @@
26332633
# octaves = 3,
26342634
# persistence = 0.5,
26352635
# lacunarity = 2.0,
2636-
# flags =
2636+
# flags =
26372637
# }
26382638

26392639
# Second of two 3D noises that together define tunnels.
@@ -2646,7 +2646,7 @@
26462646
# octaves = 3,
26472647
# persistence = 0.5,
26482648
# lacunarity = 2.0,
2649-
# flags =
2649+
# flags =
26502650
# }
26512651

26522652
# 3D noise defining giant caverns.
@@ -2659,7 +2659,7 @@
26592659
# octaves = 5,
26602660
# persistence = 0.63,
26612661
# lacunarity = 2.0,
2662-
# flags =
2662+
# flags =
26632663
# }
26642664

26652665
# 3D noise that determines number of dungeons per mapchunk.
@@ -2672,7 +2672,7 @@
26722672
# octaves = 2,
26732673
# persistence = 0.8,
26742674
# lacunarity = 2.0,
2675-
# flags =
2675+
# flags =
26762676
# }
26772677

26782678
## Mapgen Flat
@@ -2782,7 +2782,7 @@
27822782
# octaves = 3,
27832783
# persistence = 0.5,
27842784
# lacunarity = 2.0,
2785-
# flags =
2785+
# flags =
27862786
# }
27872787

27882788
# Second of two 3D noises that together define tunnels.
@@ -2795,7 +2795,7 @@
27952795
# octaves = 3,
27962796
# persistence = 0.5,
27972797
# lacunarity = 2.0,
2798-
# flags =
2798+
# flags =
27992799
# }
28002800

28012801
# 3D noise that determines number of dungeons per mapchunk.
@@ -2808,7 +2808,7 @@
28082808
# octaves = 2,
28092809
# persistence = 0.8,
28102810
# lacunarity = 2.0,
2811-
# flags =
2811+
# flags =
28122812
# }
28132813

28142814
## Mapgen Fractal
@@ -2982,7 +2982,7 @@
29822982
# octaves = 3,
29832983
# persistence = 0.5,
29842984
# lacunarity = 2.0,
2985-
# flags =
2985+
# flags =
29862986
# }
29872987

29882988
# Second of two 3D noises that together define tunnels.
@@ -2995,7 +2995,7 @@
29952995
# octaves = 3,
29962996
# persistence = 0.5,
29972997
# lacunarity = 2.0,
2998-
# flags =
2998+
# flags =
29992999
# }
30003000

30013001
# 3D noise that determines number of dungeons per mapchunk.
@@ -3008,7 +3008,7 @@
30083008
# octaves = 2,
30093009
# persistence = 0.8,
30103010
# lacunarity = 2.0,
3011-
# flags =
3011+
# flags =
30123012
# }
30133013

30143014
## Mapgen Valleys
@@ -3098,7 +3098,7 @@
30983098
# octaves = 3,
30993099
# persistence = 0.5,
31003100
# lacunarity = 2.0,
3101-
# flags =
3101+
# flags =
31023102
# }
31033103

31043104
# Second of two 3D noises that together define tunnels.
@@ -3111,7 +3111,7 @@
31113111
# octaves = 3,
31123112
# persistence = 0.5,
31133113
# lacunarity = 2.0,
3114-
# flags =
3114+
# flags =
31153115
# }
31163116

31173117
# The depth of dirt or other biome filler node.
@@ -3137,7 +3137,7 @@
31373137
# octaves = 6,
31383138
# persistence = 0.63,
31393139
# lacunarity = 2.0,
3140-
# flags =
3140+
# flags =
31413141
# }
31423142

31433143
# Defines large-scale river channel structure.
@@ -3189,7 +3189,7 @@
31893189
# octaves = 6,
31903190
# persistence = 0.8,
31913191
# lacunarity = 2.0,
3192-
# flags =
3192+
# flags =
31933193
# }
31943194

31953195
# Amplifies the valleys.
@@ -3228,7 +3228,7 @@
32283228
# octaves = 2,
32293229
# persistence = 0.8,
32303230
# lacunarity = 2.0,
3231-
# flags =
3231+
# flags =
32323232
# }
32333233

32343234
## Advanced
@@ -3292,3 +3292,4 @@
32923292
# so see a full list at https://content.minetest.net/help/content_flags/
32933293
# type: string
32943294
# contentdb_flag_blacklist = nonfree, desktop_default
3295+

Diff for: ‎src/settings_translation_file.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ fake_function() {
286286
gettext("Open the pause menu when the window's focus is lost. Does not pause if a formspec is\nopen.");
287287
gettext("Viewing range");
288288
gettext("View distance in nodes.");
289-
gettext("Near clipping plane");
290-
gettext("Camera 'near clipping plane' distance in nodes, between 0 and 0.5.\nMost users will not need to change this.\nIncreasing can reduce artifacting on weaker GPUs.\n0.1 = Default, 0.25 = Good value for weaker tablets.");
289+
gettext("Near plane");
290+
gettext("Camera 'near clipping plane' distance in nodes, between 0 and 0.25\nOnly works on GLES platforms. Most users will not need to change this.\nIncreasing can reduce artifacting on weaker GPUs.\n0.1 = Default, 0.25 = Good value for weaker tablets.");
291291
gettext("Screen width");
292292
gettext("Width component of the initial window size.");
293293
gettext("Screen height");

0 commit comments

Comments
 (0)
Please sign in to comment.