Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@SpaceWalkerRS
SpaceWalkerRS committed Jan 29, 2025
1 parent e37b766 commit cdb220c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion mappings/1.6.2-091847#13w36a-09051446.tinydiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7871,7 +7871,7 @@ c net/minecraft/unmapped/C_1845800 net/minecraft/world/gen/feature/GiantSpruceT
p 4 y
p 5 baseRadius
p 6 random
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;III)V m_7018338 placePodzolPatches
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;III)V m_7018338 m_7018338
p 1 p_1
p 2 p_2
p 3 p_3
Expand Down
4 changes: 2 additions & 2 deletions mappings/1.7.4#14w02a.tinydiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14553,7 +14553,7 @@ c net/minecraft/unmapped/C_1845800
p 3 p_3
p 4 p_4
p 5 p_5
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;III)V m_7018338 placePodzolPatches
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;III)V m_7018338 m_7018338
p 1 p_1
p 2 p_2
p 3 p_3
Expand All @@ -14574,7 +14574,7 @@ c net/minecraft/unmapped/C_1845800
p 1 p_1
p 2 p_2
p 3 p_3
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placePodzolPatches
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 m_7018338
p 1 p_1
p 2 p_2
p 3 p_3
Expand Down
16 changes: 8 additions & 8 deletions mappings/18w05a#18w06a.tinydiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6810,7 +6810,7 @@ c net/minecraft/unmapped/C_1845800
p 1 p_1
p 2 p_2
p 3 p_3
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placePodzolPatches
m (Lnet/minecraft/unmapped/C_3906126;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 m_7018338
p 1 p_1
p 2 p_2
p 3 p_3
Expand All @@ -6833,10 +6833,10 @@ c net/minecraft/unmapped/C_1845800
p 4 maxY
p 5 radius
p 6 random
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placePodzolPatches
p 1 world
p 2 random
p 3 pos
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 m_7018338
p 1 p_1
p 2 p_2
p 3 p_3
m (Lnet/minecraft/unmapped/C_9844932;Lnet/minecraft/unmapped/C_6707278;)V m_0211573 placePodzolPatch
p 1 world
p 2 pos
Expand Down Expand Up @@ -6935,9 +6935,9 @@ c net/minecraft/unmapped/C_6049345
p 1 world
p 2 pos
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placeSoil
p 1 p_1
p 2 p_2
p 3 p_3
p 1 world
p 2 random
p 3 pos
m (Lnet/minecraft/unmapped/C_9844932;Lnet/minecraft/unmapped/C_6707278;)V m_2290911 placeDirt
p 1 world
p 2 pos
Expand Down
11 changes: 8 additions & 3 deletions mappings/18w07a#18w07b.tinydiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ c net/minecraft/unmapped/C_5251467
f Lnet/minecraft/unmapped/C_3635204; f_7119322 BUBBLE_COLUMN
c net/minecraft/unmapped/C_6049345
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placeSoil
p 1 p_1
p 2 p_2
p 3 p_3
p 1 world
p 2 random
p 3 pos
c net/minecraft/unmapped/C_2266228
f Z f_1527133 cullEnabled
c net/minecraft/unmapped/C_2019151
Expand Down Expand Up @@ -312,3 +312,8 @@ c net/minecraft/unmapped/C_9707472
p 1 p_1
c net/minecraft/unmapped/C_3906126
m ()Lnet/minecraft/server/MinecraftServer; m_2367760 m_2367760 getServer
c net/minecraft/unmapped/C_1845800
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 m_7018338 placeSoil
p 1 p_1 world
p 2 p_2 random
p 3 p_3 pos
10 changes: 5 additions & 5 deletions mappings/18w45a#18w46a.tinydiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1822,7 +1822,7 @@ c net/minecraft/unmapped/C_1845800
p 4 maxY
p 5 radius
p 6 random
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placePodzolPatches
m (Lnet/minecraft/unmapped/C_9844932;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placeSoil
p 1 world
p 2 random
p 3 pos
Expand All @@ -1849,10 +1849,10 @@ c net/minecraft/unmapped/C_1845800
p 4 p_4
p 5 p_5
p 6 p_6
m (Lnet/minecraft/unmapped/C_3994775;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placePodzolPatches
p 1 p_1
p 2 p_2
p 3 p_3
m (Lnet/minecraft/unmapped/C_3994775;Ljava/util/Random;Lnet/minecraft/unmapped/C_6707278;)V m_7018338 placeSoil
p 1 world
p 2 random
p 3 pos
m (Lnet/minecraft/unmapped/C_3994775;Lnet/minecraft/unmapped/C_6707278;)V m_0211573 placePodzolPatch
p 1 p_1
p 2 p_2
Expand Down

0 comments on commit cdb220c

Please sign in to comment.