search

LeavesMC / Leaves

Fork of Paper aimed at repairing broken vanilla properties.
https://leavesmc.org
Other
325 stars 34 forks source link

Upload to cloud #215

Closed LittleChest closed 1 month ago

Bluemangoo commented 1 month ago

又在主分支。。。

Bluemangoo commented 1 month ago

你交到.6那个分支去吧。（

@MC-XiaoHei

LittleChest commented 1 month ago

你交到.6那个分支去吧。（

@MC-XiaoHei

cherry-pick

Bluemangoo commented 1 month ago

你交到.6那个分支去吧。（ @MC-XiaoHei

cherry-pick

要修冲突的。

Bluemangoo commented 1 month ago

@s-yh-china 你是不是忘记合并这个了。

s-yh-china commented 1 month ago

合不了啊

Bluemangoo commented 1 month ago

6

@LittleChest

LittleChest commented 1 month ago

6

@LittleChest

为什么会有冲突啊

Bluemangoo commented 1 month ago

因为有极大量修改。

LittleChest commented 1 month ago

6 @LittleChest

为什么会有冲突啊

原来在19小时前同步了1.20.6分支