Résolution des conflicts

src/scenes/jeu/Jeu.tscn

@@ -205,7 +205,7 @@ texture_outil = ExtResource( 1 )
 
 [node name="Terrain" parent="Outils" instance=ExtResource( 11 )]
 position = Vector2( 250, 46 )
-_couches = [ [ 0, 1, 10 ], [ 0, 1, 30 ], [ 0, 1, 70 ], [ 1, null, null ], [ 3, null, null ], [ 2, null, null ], [ 1, null, null ], [ 5, null, null ] ]
+_couches = [ [ 0, 1, 10 ], [ 0, 1, 30 ], [ 0, 1, 70 ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, 2, 20 ], [ 1, 2, 70 ], [ 1, 2, 90 ], [ 2, null, null ], [ 2, null, null ], [ 2, 3, 30 ], [ 2, 3, 70 ], [ 3, 4, 40 ], [ 3, 4, 70 ], [ 5, null, null ] ]
 _taille_x = 32
 _taille_y = 46
 _textures = [ "res://terrain/textures/herbe.png", "res://terrain/textures/terre.png", "res://terrain/textures/sable.png", "res://terrain/textures/gravier.png", "res://terrain/textures/pierre.png", "res://terrain/textures/bedrock.png" ]

src/scenes/scene2/scene2.tscn

@@ -197,7 +197,7 @@ margin_right = 619.437
 margin_bottom = 121.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = ", suit a des fouilles archéologiques nous avons retrouvé :"
+text = ", sur cette fouille achéologique j'ai trouvé ::"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -221,7 +221,7 @@ margin_right = 100.0
 margin_bottom = 225.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = "Epoque estime :"
+text = "Epoque estimée :"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -233,7 +233,7 @@ margin_right = 132.0
 margin_bottom = 265.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = "Date estime :"
+text = "Date estimée :"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -276,9 +276,9 @@ __meta__ = {
 }
 
 [node name="edit_epoque" type="LineEdit" parent="annalyse/Panel"]
-margin_left = 231.746
+margin_left = 152.0
 margin_top = 205.0
-margin_right = 400.746
+margin_right = 321.0
 margin_bottom = 229.0
 custom_styles/focus = SubResource( 3 )
 custom_styles/normal = SubResource( 4 )
@@ -289,9 +289,9 @@ __meta__ = {
 }
 
 [node name="edit_date" type="LineEdit" parent="annalyse/Panel"]
-margin_left = 147.153
+margin_left = 134.0
 margin_top = 246.0
-margin_right = 259.153
+margin_right = 246.0
 margin_bottom = 270.0
 custom_styles/focus = SubResource( 3 )
 custom_styles/normal = SubResource( 4 )