API tools faq
paste
Advertisement
Guest User

meh

a guest
Oct 29th, 2016
158
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 30.56 KB | None | 0 0
raw download clone embed print report
  1. iMac-srv:ClearSky_main Tim$ git remote add https://github.com/pmmp/PocketMine-MP.git
  2. usage: git remote add [<options>] <name> <url>
  3.  
  4.     -f, --fetch           fetch the remote branches
  5.     --tags                import all tags and associated objects when fetching
  6.                           or do not fetch any tag at all (--no-tags)
  7.     -t, --track <branch>  branch(es) to track
  8.     -m, --master <branch>
  9.                           master branch
  10.     --mirror[=<push|fetch>]
  11.                           set up remote as a mirror to push to or fetch from
  12.  
  13. iMac-srv:ClearSky_main Tim$ git remote add pmmp https://github.com/pmmp/PocketMine-MP.git
  14. iMac-srv:ClearSky_main Tim$ git fetch pmmp
  15. warning: no common commits
  16. remote: Counting objects: 42296, done.
  17. remote: Compressing objects: 100% (253/253), done.
  18. remote: Total 42296 (delta 110), reused 16 (delta 0), pack-reused 42043
  19. Receiving objects: 100% (42296/42296), 11.93 MiB | 132.00 KiB/s, done.
  20. Resolving deltas: 100% (31725/31725), done.
  21. From https://github.com/pmmp/PocketMine-MP
  22.  * [new branch]      0.16       -> pmmp/0.16
  23.  * [new branch]      api-warning-2 -> pmmp/api-warning-2
  24.  * [new branch]      isp        -> pmmp/isp
  25.  * [new branch]      master     -> pmmp/master
  26.  * [new branch]      new-protocol-api -> pmmp/new-protocol-api
  27.  * [new branch]      nonetwork  -> pmmp/nonetwork
  28.  * [new branch]      riding-work -> pmmp/riding-work
  29.  * [new tag]         1.4        -> 1.4
  30.  * [new tag]         1.4-916    -> 1.4-916
  31.  * [new tag]         1.4.1      -> 1.4.1
  32.  * [new tag]         1.4.1dev-936 -> 1.4.1dev-936
  33.  * [new tag]         1.6dev     -> 1.6dev
  34.  * [new tag]         Alpha_1.0.4 -> Alpha_1.0.4
  35.  * [new tag]         Alpha_1.0.5 -> Alpha_1.0.5
  36.  * [new tag]         Alpha_1.0.6 -> Alpha_1.0.6
  37.  * [new tag]         Alpha_1.0.7 -> Alpha_1.0.7
  38.  * [new tag]         Alpha_1.0.8 -> Alpha_1.0.8
  39.  * [new tag]         Alpha_1.1  -> Alpha_1.1
  40.  * [new tag]         Alpha_1.1.1 -> Alpha_1.1.1
  41.  * [new tag]         Alpha_1.2  -> Alpha_1.2
  42.  * [new tag]         Alpha_1.2.1 -> Alpha_1.2.1
  43.  * [new tag]         Alpha_1.3  -> Alpha_1.3
  44.  * [new tag]         Alpha_1.3.1 -> Alpha_1.3.1
  45.  * [new tag]         Alpha_1.3.10 -> Alpha_1.3.10
  46.  * [new tag]         Alpha_1.3.11 -> Alpha_1.3.11
  47.  * [new tag]         Alpha_1.3.12 -> Alpha_1.3.12
  48.  * [new tag]         Alpha_1.3.2 -> Alpha_1.3.2
  49.  * [new tag]         Alpha_1.3.3 -> Alpha_1.3.3
  50.  * [new tag]         Alpha_1.3.4 -> Alpha_1.3.4
  51.  * [new tag]         Alpha_1.3.5 -> Alpha_1.3.5
  52.  * [new tag]         Alpha_1.3.7 -> Alpha_1.3.7
  53.  * [new tag]         Alpha_1.3.8 -> Alpha_1.3.8
  54.  * [new tag]         Alpha_1.3.9 -> Alpha_1.3.9
  55.  * [new tag]         Alpha_1.4dev-228 -> Alpha_1.4dev-228
  56.  * [new tag]         Alpha_1.4dev-277 -> Alpha_1.4dev-277
  57.  * [new tag]         Alpha_1.4dev-413 -> Alpha_1.4dev-413
  58.  * [new tag]         Alpha_1.4dev-449 -> Alpha_1.4dev-449
  59.  * [new tag]         Alpha_1.4dev-478 -> Alpha_1.4dev-478
  60.  * [new tag]         Alpha_1.4dev-491 -> Alpha_1.4dev-491
  61.  * [new tag]         Alpha_1.4dev-576 -> Alpha_1.4dev-576
  62.  * [new tag]         Alpha_1.4dev-599 -> Alpha_1.4dev-599
  63.  * [new tag]         Alpha_1.4dev-659 -> Alpha_1.4dev-659
  64.  * [new tag]         Alpha_1.4dev-665 -> Alpha_1.4dev-665
  65.  * [new tag]         Alpha_1.4dev-707 -> Alpha_1.4dev-707
  66.  * [new tag]         Alpha_1.4dev-822 -> Alpha_1.4dev-822
  67.  * [new tag]         Alpha_1.4dev-834 -> Alpha_1.4dev-834
  68.  * [new tag]         Alpha_1.4dev-842 -> Alpha_1.4dev-842
  69.  * [new tag]         Alpha_1.4dev-847 -> Alpha_1.4dev-847
  70.  * [new tag]         Alpha_1.4dev-855 -> Alpha_1.4dev-855
  71.  * [new tag]         Alpha_1.4dev-900 -> Alpha_1.4dev-900
  72. iMac-srv:ClearSky_main Tim$ git cherry-pick f7161dcd8c28cc2feef5408cfe385fbdfe324529
  73. [0.16-ALPHA 1299487] Add missing import
  74.  Author: Dylan K. Taylor <odigiman@gmail.com>
  75.  Date: Fri Oct 21 18:56:06 2016 +0100
  76.  1 file changed, 1 insertion(+)
  77. iMac-srv:ClearSky_main Tim$ git cherry-pick
  78. .DS_Store       .git/           .gitignore      LICENSE         circle.yml      src/            start.sh        
  79. .editorconfig   .gitattributes  .travis.yml     README.md       images/         start.cmd      
  80. iMac-srv:ClearSky_main Tim$ git cherry-pick 9f5894c
  81. error: Your local changes to the following files would be overwritten by merge:
  82.     src/pocketmine/utils/Binary.php
  83. Please commit your changes or stash them before you can merge.
  84. Aborting
  85. iMac-srv:ClearSky_main Tim$ git cherry-pick 9f5894c
  86. error: could not apply 9f5894c... Initial spawn on 0.16
  87. hint: after resolving the conflicts, mark the corrected paths
  88. hint: with 'git add <paths>' or 'git rm <paths>'
  89. hint: and commit the result with 'git commit'
  90. iMac-srv:ClearSky_main Tim$ git add -u
  91. iMac-srv:ClearSky_main Tim$ git commit
  92. #[0.16-ALPHA 7ca3ebf] Initial spawn on 0.16
  93.  Author: Dylan K. Taylor <odigiman@gmail.com>
  94.  Date: Tue Oct 4 12:29:26 2016 +0100
  95.  10 files changed, 276 insertions(+), 134 deletions(-)
  96.  rewrite src/pocketmine/network/protocol/Info.php (75%)
  97. iMac-srv:ClearSky_main Tim$ git branch -m 0.16-ALPHA 0.16
  98. iMac-srv:ClearSky_main Tim$ git push origin :0.16-ALPHA
  99. To https://github.com/ClearSkyTeam/ClearSky.git
  100.  - [deleted]         0.16-ALPHA
  101. iMac-srv:ClearSky_main Tim$ git push --set-upstream origin 0.16
  102. Counting objects: 22, done.
  103. Delta compression using up to 8 threads.
  104. Compressing objects: 100% (22/22), done.
  105. Writing objects: 100% (22/22), 153.69 KiB | 0 bytes/s, done.
  106. Total 22 (delta 16), reused 0 (delta 0)
  107. remote: Resolving deltas: 100% (16/16), completed with 15 local objects.
  108. To https://github.com/ClearSkyTeam/ClearSky.git
  109.  * [new branch]      0.16 -> 0.16
  110. Branch 0.16 set up to track remote branch 0.16 from origin.
  111. iMac-srv:ClearSky_main Tim$ git cherry-pick 1611628786af447c52e57affe0e0a0741cda3a5a
  112. error: could not apply 1611628... Fixed chunk loading and movement
  113. hint: after resolving the conflicts, mark the corrected paths
  114. hint: with 'git add <paths>' or 'git rm <paths>'
  115. hint: and commit the result with 'git commit'
  116. iMac-srv:ClearSky_main Tim$ git add -u
  117. iMac-srv:ClearSky_main Tim$ git commit
  118. [0.16 cc2b8a3] Fixed chunk loading and movement
  119.  Author: Dylan K. Taylor <odigiman@gmail.com>
  120.  Date: Tue Oct 4 12:42:05 2016 +0100
  121.  5 files changed, 21 insertions(+), 25 deletions(-)
  122. iMac-srv:ClearSky_main Tim$ git cherry-pick 1611628786af447c52e57affe0e0a0741cda3a5a
  123. On branch 0.16
  124. Your branch is ahead of 'origin/0.16' by 1 commit.
  125.   (use "git push" to publish your local commits)
  126. You are currently cherry-picking commit 1611628.
  127.  
  128. nothing to commit, working directory clean
  129. The previous cherry-pick is now empty, possibly due to conflict resolution.
  130. If you wish to commit it anyway, use:
  131.  
  132.     git commit --allow-empty
  133.  
  134. Otherwise, please use 'git reset'
  135. iMac-srv:ClearSky_main Tim$ git cherry-pick 52f0329bf4d34860433278bce0436c6642ae47ef
  136. error: could not apply 52f0329... Fixed FOV and attributes
  137. hint: after resolving the conflicts, mark the corrected paths
  138. hint: with 'git add <paths>' or 'git rm <paths>'
  139. hint: and commit the result with 'git commit'
  140. iMac-srv:ClearSky_main Tim$ git add -u
  141. iMac-srv:ClearSky_main Tim$ git commit
  142. [0.16 d5b6a3e] Fixed FOV and attributes
  143.  Author: Dylan K. Taylor <odigiman@gmail.com>
  144.  Date: Wed Sep 28 12:24:37 2016 +0100
  145.  3 files changed, 38 insertions(+), 28 deletions(-)
  146. iMac-srv:ClearSky_main Tim$ git cherry-pick 90dcadec703116cca97a87f5411e643ba1ced414
  147. error: could not apply 90dcade... Base inventory fixes
  148. hint: after resolving the conflicts, mark the corrected paths
  149. hint: with 'git add <paths>' or 'git rm <paths>'
  150. hint: and commit the result with 'git commit'
  151. iMac-srv:ClearSky_main Tim$ git add -u
  152. iMac-srv:ClearSky_main Tim$ git commit
  153. [0.16 88d496e] Base inventory fixes
  154.  Author: Dylan K. Taylor <odigiman@gmail.com>
  155.  Date: Tue Oct 4 12:54:38 2016 +0100
  156.  3 files changed, 23 insertions(+), 25 deletions(-)
  157. iMac-srv:ClearSky_main Tim$
  158.   [Restored 26 Oct 2016 08:14:19]
  159. Last login: Wed Oct 26 08:14:19 on ttys001
  160. You have mail.
  161. iMac-srv:ClearSky_main Tim$
  162.   [Restored 26 Oct 2016 13:28:01]
  163. Last login: Wed Oct 26 13:27:52 on console
  164. You have mail.
  165. iMac-srv:ClearSky_main Tim$
  166.   [Restored 26 Oct 2016 14:18:24]
  167. Last login: Wed Oct 26 14:18:08 on console
  168. You have mail.
  169. Restored session: Wed Oct 26 14:14:45 CEST 2016
  170. iMac-srv:ClearSky_main Tim$ Hallo
  171.   [Restored 28 Oct 2016 14:10:30]
  172. Last login: Fri Oct 28 14:10:18 on console
  173. You have mail.
  174. iMac-srv:ClearSky_main Tim$ git cherry-pick affed330664d901cc5e478cee482f489e6d582d5
  175. fatal: bad object affed330664d901cc5e478cee482f489e6d582d5
  176. iMac-srv:ClearSky_main Tim$ git fetch
  177. iMac-srv:ClearSky_main Tim$ git pull
  178. Already up-to-date.
  179. iMac-srv:ClearSky_main Tim$ git cherry-pick affed330664d901cc5e478cee482f489e6d582d5
  180. fatal: bad object affed330664d901cc5e478cee482f489e6d582d5
  181. iMac-srv:ClearSky_main Tim$ git remote lis
  182. error: Unknown subcommand: lis
  183. usage: git remote [-v | --verbose]
  184.    or: git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>
  185.    or: git remote rename <old> <new>
  186.    or: git remote remove <name>
  187.    or: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
  188.    or: git remote [-v | --verbose] show [-n] <name>
  189.    or: git remote prune [-n | --dry-run] <name>
  190.    or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
  191.    or: git remote set-branches [--add] <name> <branch>...
  192.    or: git remote get-url [--push] [--all] <name>
  193.    or: git remote set-url [--push] <name> <newurl> [<oldurl>]
  194.    or: git remote set-url --add <name> <newurl>
  195.    or: git remote set-url --delete <name> <url>
  196.  
  197.     -v, --verbose         be verbose; must be placed before a subcommand
  198.  
  199. iMac-srv:ClearSky_main Tim$ git remote list
  200. error: Unknown subcommand: list
  201. usage: git remote [-v | --verbose]
  202.    or: git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>
  203.    or: git remote rename <old> <new>
  204.    or: git remote remove <name>
  205.    or: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
  206.    or: git remote [-v | --verbose] show [-n] <name>
  207.    or: git remote prune [-n | --dry-run] <name>
  208.    or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
  209.    or: git remote set-branches [--add] <name> <branch>...
  210.    or: git remote get-url [--push] [--all] <name>
  211.    or: git remote set-url [--push] <name> <newurl> [<oldurl>]
  212.    or: git remote set-url --add <name> <newurl>
  213.    or: git remote set-url --delete <name> <url>
  214.  
  215.     -v, --verbose         be verbose; must be placed before a subcommand
  216.  
  217. iMac-srv:ClearSky_main Tim$ git remote -v
  218. GenisysMAIN https://github.com/iTXTech/Genisys.git (fetch)
  219. GenisysMAIN https://github.com/iTXTech/Genisys.git (push)
  220. GenisysMinecarts    https://github.com/gimilii/Genisys.git (fetch)
  221. GenisysMinecarts    https://github.com/gimilii/Genisys.git (push)
  222. origin  https://github.com/ClearSkyTeam/ClearSky.git (fetch)
  223. origin  https://github.com/ClearSkyTeam/ClearSky.git (push)
  224. pmmp    https://github.com/pmmp/PocketMine-MP.git (fetch)
  225. pmmp    https://github.com/pmmp/PocketMine-MP.git (push)
  226. iMac-srv:ClearSky_main Tim$ git fetch pmmp
  227.  
  228. remote: Counting objects: 495, done.
  229. remote: Compressing objects: 100% (293/293), done.
  230. remote: Total 495 (delta 324), reused 178 (delta 178), pack-reused 24
  231. Receiving objects: 100% (495/495), 138.68 KiB | 130.00 KiB/s, done.
  232. Resolving deltas: 100% (324/324), completed with 54 local objects.
  233. From https://github.com/pmmp/PocketMine-MP
  234.  + f7161dc...46af92f 0.16       -> pmmp/0.16  (forced update)
  235.  * [new branch]      0.16-isp   -> pmmp/0.16-isp
  236.  * [new branch]      dev-0.16/blocks -> pmmp/dev-0.16/blocks
  237.    8059fe2..c5de8bb  isp        -> pmmp/isp
  238.    702ab53..55ad6c6  master     -> pmmp/master
  239. iMac-srv:ClearSky_main Tim$
  240. iMac-srv:ClearSky_main Tim$ git cherry-pick affed330664d901cc5e478cee482f489e6d582d5
  241. error: could not apply affed33... Add length check assertions
  242. hint: after resolving the conflicts, mark the corrected paths
  243. hint: with 'git add <paths>' or 'git rm <paths>'
  244. hint: and commit the result with 'git commit'
  245. iMac-srv:ClearSky_main Tim$ git add -u
  246. iMac-srv:ClearSky_main Tim$ git commit
  247. +[0.16 abd35a5] Add length check assertions
  248.  Author: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
  249.  Date: Tue Oct 4 13:13:27 2016 +0100
  250.  1 file changed, 18 insertions(+), 4 deletions(-)
  251. iMac-srv:ClearSky_main Tim$ git cherry-pick 8f9574dec5ff5991c0bec13f4bcf21678ce5cd78
  252. error: could not apply 8f9574d... Fixed FOV and attributes
  253. hint: after resolving the conflicts, mark the corrected paths
  254. hint: with 'git add <paths>' or 'git rm <paths>'
  255. hint: and commit the result with 'git commit'
  256. iMac-srv:ClearSky_main Tim$ git add -u
  257. iMac-srv:ClearSky_main Tim$ git cherry-pick 2bb50792c32998948f48b78b693a8ad64f0764d9
  258. [0.16 8e56514] Fast commands hack for old plugins.
  259.  Author: Dylan K. Taylor <odigiman@gmail.com>
  260.  Date: Mon Oct 3 14:51:02 2016 +0100
  261.  1 file changed, 2 insertions(+), 2 deletions(-)
  262. iMac-srv:ClearSky_main Tim$ git cherry-pick 86ed0f1397566c33a970743500904d09f34c74e1
  263. error: could not apply 86ed0f1... Updated existing packets and added new ones
  264. hint: after resolving the conflicts, mark the corrected paths
  265. hint: with 'git add <paths>' or 'git rm <paths>'
  266. hint: and commit the result with 'git commit'
  267. iMac-srv:ClearSky_main Tim$ git add /src/pocketmine/network/Network.php
  268. fatal: Could not switch to '/src/': No such file or directory
  269. iMac-srv:ClearSky_main Tim$ git add src/pocketmine/network/Network.php
  270. iMac-srv:ClearSky_main Tim$ add src/pocketmine/network/protocol/MoveEntityPacket.php
  271. -bash: add: command not found
  272. iMac-srv:ClearSky_main Tim$ git add src/pocketmine/network/protocol/MoveEntityPacket.php
  273. iMac-srv:ClearSky_main Tim$ git add -u
  274. iMac-srv:ClearSky_main Tim$ git commit
  275. [0.16 ba52dce] Updated existing packets and added new ones
  276.  Author: Dylan K. Taylor <odigiman@gmail.com>
  277.  Date: Tue Oct 4 15:07:53 2016 +0100
  278.  49 files changed, 567 insertions(+), 234 deletions(-)
  279.  create mode 100644 src/pocketmine/network/protocol/AddHangingEntityPacket.php
  280.  create mode 100644 src/pocketmine/network/protocol/AddItemPacket.php
  281.  create mode 100644 src/pocketmine/network/protocol/InventoryActionPacket.php
  282.  create mode 100644 src/pocketmine/network/protocol/LevelSoundEventPacket.php
  283.  create mode 100644 src/pocketmine/network/protocol/ReplaceSelectedItemPacket.php
  284.  create mode 100644 src/pocketmine/network/protocol/SetCommandsEnabledPacket.php
  285.  create mode 100644 src/pocketmine/network/protocol/SpawnExperienceOrbPacket.php
  286. iMac-srv:ClearSky_main Tim$ git cherry-pick ff40c0a070f3f40cbf7216e3d44c0bb7de98de20
  287. error: could not apply ff40c0a... NBT updates and tile spawns fixed
  288. hint: after resolving the conflicts, mark the corrected paths
  289. hint: with 'git add <paths>' or 'git rm <paths>'
  290. hint: and commit the result with 'git commit'
  291. iMac-srv:ClearSky_main Tim$ git add -u
  292. iMac-srv:ClearSky_main Tim$ git commit
  293. [0.16 8ebcd32] NBT updates and tile spawns fixed
  294.  Author: Dylan K. Taylor <odigiman@gmail.com>
  295.  Date: Tue Oct 4 18:45:03 2016 +0100
  296.  20 files changed, 130 insertions(+), 98 deletions(-)
  297. iMac-srv:ClearSky_main Tim$ git cherry-pick 85c50731f858e653a221ddfc7556a9d23f475ca4
  298. [0.16 d1faf4d] Fixed crafting (cannot test enchanting)
  299.  Author: Dylan K. Taylor <odigiman@gmail.com>
  300.  Date: Tue Oct 4 20:08:43 2016 +0100
  301.  2 files changed, 19 insertions(+), 20 deletions(-)
  302. iMac-srv:ClearSky_main Tim$ git cherry-pick 08f11412a4b92647675cdc6fae657e4110038811
  303. error: could not apply 08f1141... AdventureSettings fixes and added isFlying properties and methods
  304. hint: after resolving the conflicts, mark the corrected paths
  305. hint: with 'git add <paths>' or 'git rm <paths>'
  306. hint: and commit the result with 'git commit'
  307. iMac-srv:ClearSky_main Tim$ git cherry-pick 08f11412a4b92647675cdc6fae657e4110038811
  308. error: cherry-pick is not possible because you have unmerged files.
  309. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  310. hint: as appropriate to mark resolution and make a commit.
  311. fatal: cherry-pick failed
  312. iMac-srv:ClearSky_main Tim$ git commit
  313. U   src/pocketmine/Player.php
  314. U   src/pocketmine/PocketMine.php
  315. U   src/pocketmine/network/protocol/AdventureSettingsPacket.php
  316. error: commit is not possible because you have unmerged files.
  317. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  318. hint: as appropriate to mark resolution and make a commit.
  319. fatal: Exiting because of an unresolved conflict.
  320. iMac-srv:ClearSky_main Tim$ git add -u
  321. iMac-srv:ClearSky_main Tim$ git commit
  322. [0.16 7766fcc] AdventureSettings fixes and added isFlying properties and methods
  323.  Author: Dylan K. Taylor <odigiman@gmail.com>
  324.  Date: Tue Oct 4 21:54:21 2016 +0100
  325.  3 files changed, 86 insertions(+), 9 deletions(-)
  326. iMac-srv:ClearSky_main Tim$ git cherry-pick e35ed7f04ab1dedc1e60d88d8ccd3fadc04333b5
  327. [0.16 42278fb] New fields for LevelSoundEventPacket (previously unknown)
  328.  Author: Dylan K. Taylor <odigiman@gmail.com>
  329.  Date: Tue Oct 4 22:03:02 2016 +0100
  330.  1 file changed, 7 insertions(+), 8 deletions(-)
  331. iMac-srv:ClearSky_main Tim$ git cherry-pick 9242f89221847cb8989919d869478aee7c90ae86
  332. error: Your local changes to the following files would be overwritten by merge:
  333.     src/pocketmine/Player.php
  334. Please commit your changes or stash them before you can merge.
  335. Aborting
  336. iMac-srv:ClearSky_main Tim$ git cherry-pick 9242f89221847cb8989919d869478aee7c90ae86
  337. [0.16 9771be8] Add PlayerToggleFlightEvent
  338.  Author: Dylan K. Taylor <odigiman@gmail.com>
  339.  Date: Fri Oct 7 12:04:23 2016 +0100
  340.  2 files changed, 49 insertions(+), 1 deletion(-)
  341.  create mode 100644 src/pocketmine/event/player/PlayerToggleFlightEvent.php
  342. iMac-srv:ClearSky_main Tim$ git cherry-pick 39ffc28f2a71bce1eed4ac693eb9e718b70ea603
  343. error: could not apply 39ffc28... Auto-generated data for 0.15.90.8 (not functionalyet)
  344. hint: after resolving the conflicts, mark the corrected paths
  345. hint: with 'git add <paths>' or 'git rm <paths>'
  346. hint: and commit the result with 'git commit'
  347. iMac-srv:ClearSky_main Tim$ git add -u
  348. iMac-srv:ClearSky_main Tim$ git commit
  349. [0.16 bdbc288] Auto-generated data for 0.15.90.8 (not functionalyet)
  350.  Author: Dylan K. Taylor <odigiman@gmail.com>
  351.  Date: Fri Oct 7 20:35:12 2016 +0100
  352.  3 files changed, 99 insertions(+), 94 deletions(-)
  353.  rewrite src/pocketmine/network/protocol/Info.php (83%)
  354. iMac-srv:ClearSky_main Tim$ git cherry-pick 9a12aa689e71e0eafaf5776a1050e55fa9f6239a
  355. [0.16 7438844] New StartGamePacket fields for 0.15.90.8
  356.  Author: Dylan K. Taylor <odigiman@gmail.com>
  357.  Date: Sat Oct 8 15:44:52 2016 +0100
  358.  1 file changed, 4 insertions(+), 2 deletions(-)
  359. iMac-srv:ClearSky_main Tim$ git cherry-pick 7cd7a7fbf67bf565fa29349aeb328078ef19f202
  360. error: could not apply 7cd7a7f... Spawn working on new build. TODO: Resource packs.
  361. hint: after resolving the conflicts, mark the corrected paths
  362. hint: with 'git add <paths>' or 'git rm <paths>'
  363. hint: and commit the result with 'git commit'
  364. iMac-srv:ClearSky_main Tim$ git add -u
  365. iMac-srv:ClearSky_main Tim$ git commit
  366. [0.16 a3173bb] Spawn working on new build. TODO: Resource packs.
  367.  Author: Dylan K. Taylor <odigiman@gmail.com>
  368.  Date: Tue Oct 11 22:31:13 2016 +0100
  369.  5 files changed, 157 insertions(+)
  370.  create mode 100644 src/pocketmine/network/protocol/ResourcePackClientResponsePacket.php
  371.  create mode 100644 src/pocketmine/network/protocol/ResourcePacksInfoPacket.php
  372.  create mode 100644 src/pocketmine/resourcepacks/ResourcePackInfoEntry.php
  373. iMac-srv:ClearSky_main Tim$ git cherry-pick ec328a8160ea6725f34f52cdb318c83ad168928a
  374. [0.16 308c69f] >_>
  375.  Author: Dylan K. Taylor <odigiman@gmail.com>
  376.  Date: Wed Oct 12 13:16:50 2016 +0100
  377.  2 files changed, 7 insertions(+), 7 deletions(-)
  378. iMac-srv:ClearSky_main Tim$ git cherry-pick df88e9272ed6add4360862738f3eeb7360b82f80
  379. error: could not apply df88e92... Fix DisconnectionScreen, add getBool() and putBool() methods, update some packets
  380. hint: after resolving the conflicts, mark the corrected paths
  381. hint: with 'git add <paths>' or 'git rm <paths>'
  382. hint: and commit the result with 'git commit'
  383. iMac-srv:ClearSky_main Tim$ git add -u
  384. iMac-srv:ClearSky_main Tim$ git commit
  385.  
  386. [No write since last change]
  387. /bin/bash: quit: command not found
  388.  
  389. shell returned 127
  390.  
  391. Press ENTER or type command to continue
  392. [No write since last change]
  393. /bin/bash: quit: command not found
  394.  
  395. shell returned 127
  396.  
  397. Press ENTER or type command to continue  
  398. [0.16 d6781fb] Fix DisconnectionScreen, add getBool() and putBool() methods, update some packets
  399.  Author: Dylan K. Taylor <odigiman@gmail.com>
  400.  Date: Wed Oct 12 14:14:30 2016 +0100
  401.  13 files changed, 29 insertions(+), 15 deletions(-)
  402. iMac-srv:ClearSky_main Tim$ git cherry-pick 9497dff3eedb48feaad3893835cc990b5b01651d
  403. [0.16 9f36bb4] Add decode for ResourcePackClientResponse (fields unknown)
  404.  Author: Dylan K. Taylor <odigiman@gmail.com>
  405.  Date: Wed Oct 12 14:34:13 2016 +0100
  406.  1 file changed, 5 insertions(+), 1 deletion(-)
  407. iMac-srv:ClearSky_main Tim$ git cherry-pick a45e2328293009f4781d419c178cfae1c19aa0a5
  408. [0.16 8ef6773] Fix wrong SetDifficultyPacket decode
  409.  Author: Dylan K. Taylor <odigiman@gmail.com>
  410.  Date: Wed Oct 12 15:54:57 2016 +0100
  411.  1 file changed, 1 insertion(+), 1 deletion(-)
  412. iMac-srv:ClearSky_main Tim$ git cherry-pick d6fcc59a496267eb643bdd4e1a062beab94ce20d
  413. [0.16 1387e3a] Support changing gamemode in GUI and fixed spectator flight controls
  414.  Author: Dylan K. Taylor <odigiman@gmail.com>
  415.  Date: Wed Oct 12 15:55:34 2016 +0100
  416.  2 files changed, 34 insertions(+), 7 deletions(-)
  417. iMac-srv:ClearSky_main Tim$ git cherry-pick 01d465b038ef49f6c22c9b072255384c27723347
  418. [0.16 4d8ecbd] Add decode for LevelSoundEventPacket
  419.  Author: Dylan K. Taylor <odigiman@gmail.com>
  420.  Date: Wed Oct 12 18:28:21 2016 +0100
  421.  1 file changed, 8 insertions(+), 1 deletion(-)
  422. iMac-srv:ClearSky_main Tim$ git cherry-pick bd1b18d9af6afc8818f5739d9dd26280fe93c9a6
  423. [0.16 0d26f2d] Fix issues on 64-bit systems -_- (hate php)
  424.  Author: Dylan K. Taylor <odigiman@gmail.com>
  425.  Date: Sat Oct 15 19:42:32 2016 +0100
  426.  1 file changed, 4 insertions(+), 3 deletions(-)
  427. iMac-srv:ClearSky_main Tim$ git cherry-pick 1120dff4926b0a382404aa596b108fc60de05007
  428. [0.16 6ff17dd] Fix player lists and skins
  429.  Author: Dylan K. Taylor <odigiman@gmail.com>
  430.  Date: Sun Oct 16 16:53:29 2016 +0100
  431.  1 file changed, 1 insertion(+), 1 deletion(-)
  432. iMac-srv:ClearSky_main Tim$ gut cherry-pick 5eb2459355a0fda61ed703dd63f0111422748e5f
  433. -bash: gut: command not found
  434. iMac-srv:ClearSky_main Tim$ git cherry-pick 5eb2459355a0fda61ed703dd63f0111422748e5f
  435. [0.16 b4f3ee2] Fix player list duplicates
  436.  Author: Dylan K. Taylor <odigiman@gmail.com>
  437.  Date: Sun Oct 16 17:04:15 2016 +0100
  438.  1 file changed, 3 insertions(+)
  439. iMac-srv:ClearSky_main Tim$ git cherry-pick b198f287dba74a78740b9c667734e4c3df59a0d2
  440. [0.16 b9c0589] Add AvailableCommands and CommandStep packet shells
  441.  Author: Dylan K. Taylor <odigiman@gmail.com>
  442.  Date: Wed Oct 5 12:46:08 2016 +0100
  443.  3 files changed, 95 insertions(+)
  444.  create mode 100644 src/pocketmine/network/protocol/AvailableCommandsPacket.php
  445.  create mode 100644 src/pocketmine/network/protocol/CommandStepPacket.php
  446. iMac-srv:ClearSky_main Tim$ git cherry-pick 018897062cd52ad5ba20547ff5e90fe6ad8fc964
  447. [0.16 1d2de4d] Initial working slash commands on 0.16. TODO: new API
  448.  Author: Dylan K. Taylor <odigiman@gmail.com>
  449.  Date: Thu Oct 6 11:21:48 2016 +0100
  450.  3 files changed, 93 insertions(+), 2 deletions(-)
  451. iMac-srv:ClearSky_main Tim$ git cherry-pick 192fba9c88cd088e467b5273c3c2cf1a1a488e6a
  452. [0.16 ae6a653] Resend command data when op status changes
  453.  Author: Dylan K. Taylor <odigiman@gmail.com>
  454.  Date: Thu Oct 6 13:19:40 2016 +0100
  455.  1 file changed, 16 insertions(+), 8 deletions(-)
  456. iMac-srv:ClearSky_main Tim$ git cherry-pick ed69303b4acd5f6f936313a034a6d8a9810e7944
  457. [0.16 b0f1664] Add permission checks back in
  458.  Author: Dylan K. Taylor <odigiman@gmail.com>
  459.  Date: Thu Oct 6 13:34:11 2016 +0100
  460.  1 file changed, 2 insertions(+), 2 deletions(-)
  461. iMac-srv:ClearSky_main Tim$ git cherry-pick
  462. usage: git cherry-pick [<options>] <commit-ish>...
  463.    or: git cherry-pick <subcommand>
  464.  
  465.     --quit                end revert or cherry-pick sequence
  466.     --continue            resume revert or cherry-pick sequence
  467.     --abort               cancel revert or cherry-pick sequence
  468.     -n, --no-commit       don't automatically commit
  469.    -e, --edit            edit the commit message
  470.    -s, --signoff         add Signed-off-by:
  471.    -m, --mainline <n>    parent number
  472.    --rerere-autoupdate   update the index with reused conflict resolution if possible
  473.    --strategy <strategy>
  474.                          merge strategy
  475.    -X, --strategy-option <option>
  476.                          option for merge strategy
  477.    -S, --gpg-sign[=<key-id>]
  478.                          GPG sign commit
  479.    -x                    append commit name
  480.    --ff                  allow fast-forward
  481.    --allow-empty         preserve initially empty commits
  482.    --allow-empty-message
  483.                          allow commits with empty messages
  484.    --keep-redundant-commits
  485.                          keep redundant, empty commits
  486.  
  487. iMac-srv:ClearSky_main Tim$ git cherry-pick 694c9b151fffd56aa546fd5732c3bb67246feb25
  488. error: could not apply 694c9b1... Move default data to json
  489. hint: after resolving the conflicts, mark the corrected paths
  490. hint: with 'git add <paths>' or 'git rm <paths>'
  491. hint: and commit the result with 'git commit'
  492. iMac-srv:ClearSky_main Tim$ git add -u
  493. iMac-srv:ClearSky_main Tim$ git commit
  494. [0.16 6109f78] Move default data to json
  495. Author: Dylan K. Taylor <odigiman@gmail.com>
  496. Date: Fri Oct 7 09:41:30 2016 +0100
  497. 3 files changed, 86 insertions(+), 60 deletions(-)
  498. create mode 100644 src/pocketmine/resources/command_default.json
  499. iMac-srv:ClearSky_main Tim$ git cherry-pick b6e1a21566a9bcd7888e59d348de2eb6ec63d883
  500. [0.16 2f9b5a1] Add new metadata type vector3f and correct metadata encoding. Result = client crash. TODO: new data values and flags.
  501. Author: Dylan K. Taylor <odigiman@gmail.com>
  502. Date: Thu Oct 13 13:16:19 2016 +0100
  503. 2 files changed, 49 insertions(+), 57 deletions(-)
  504. iMac-srv:ClearSky_main Tim$ git cherry-pick b1df4728d3f5703c220755ead509bce6d3768e86
  505. error: could not apply b1df472... BatchPacket payload checks, fix crashes when older versions try to join
  506. hint: after resolving the conflicts, mark the corrected paths
  507. hint: with 'git add <paths>' or 'git rm <paths>'
  508. hint: and commit the result with 'git commit'
  509. iMac-srv:ClearSky_main Tim$ git add -u
  510. iMac-srv:ClearSky_main Tim$ git commit
  511.  
  512. [No write since last change]
  513. /bin/bash: quit: command not found
  514.  
  515. shell returned 127
  516.  
  517. Press ENTER or type command to continue
  518. [No write since last change]
  519. /bin/bash: quit: command not found
  520.  
  521. shell returned 127
  522.  
  523. Press ENTER or type command to continue
  524. [No write since last change]
  525. /bin/bash: quit: command not found
  526.  
  527. shell returned 127
  528.  
  529. Press ENTER or type command to continue
  530. [No write since last change]
  531. /bin/bash: quit: command not found
  532.  
  533. shell returned 127
  534.  
  535. Press ENTER or type command to continue ?!quit
  536. [0.16 3c8ba41] cc
  537. Author: Dylan K. Taylor <odigiman@gmail.com>
  538. Date: Mon Oct 17 14:19:05 2016 +0100
  539. 1 file changed, 7 insertions(+), 2 deletions(-)
  540. iMac-srv:ClearSky_main Tim$ git rebase -i
  541. [detached HEAD bdd9be6] BatchPacket payload checks, fix crashes when older versions try to join
  542. Author: Dylan K. Taylor <odigiman@gmail.com>
  543. Date: Mon Oct 17 14:19:05 2016 +0100
  544. 1 file changed, 7 insertions(+), 2 deletions(-)
  545. Successfully rebased and updated refs/heads/0.16.
  546. iMac-srv:ClearSky_main Tim$ git cherry-pick 867ec6b509fe94fbffd1376228b6c4e5a375710e
  547. error: could not apply 867ec6b... Fix leads, crashes
  548. hint: after resolving the conflicts, mark the corrected paths
  549. hint: with 'git add <paths>' or 'git rm <paths>'
  550. hint: and commit the result with 'git commit'
  551. iMac-srv:ClearSky_main Tim$ git add -u
  552. iMac-srv:ClearSky_main Tim$ git commit
  553. [0.16 9d30fe7] Fix leads, crashes
  554. Author: Dylan K. Taylor <odigiman@gmail.com>
  555. Date: Tue Oct 18 14:57:43 2016 +0100
  556. 2 files changed, 42 insertions(+), 10 deletions(-)
  557. iMac-srv:ClearSky_main Tim$ git cherry-pick 750462aa7571a11bdefd4043e211c6620062a161
  558. [0.16 76405b3] Fix large signed varint/negative number CPU leak
  559. Author: Dylan K. Taylor <odigiman@gmail.com>
  560. Date: Thu Oct 20 22:04:47 2016 +0100
  561. 1 file changed, 1 insertion(+), 1 deletion(-)
  562. iMac-srv:ClearSky_main Tim$ git cherry-pick 787f6594b2f937ffafea90fb5cd197758a9d3d03
  563. [0.16 e0bbc4f] More new data properties
  564. Author: Dylan K. Taylor <odigiman@gmail.com>
  565. Date: Tue Oct 18 18:31:15 2016 +0100
  566. 3 files changed, 8 insertions(+), 6 deletions(-)
  567. iMac-srv:ClearSky_main Tim$ git cherry-pick 869721a8eef3684a52bc1c591be78948c71491a0
  568. [0.16 fc5eddb] Add more unknowns
  569. Author: Dylan K. Taylor <odigiman@gmail.com>
  570. Date: Tue Oct 18 19:10:18 2016 +0100
  571. 1 file changed, 6 insertions(+), 1 deletion(-)
  572. iMac-srv:ClearSky_main Tim$ git cherry-pick 035084a5ac51a7ef4d2c0ded258f50fb43d42f48
  573. [0.16 9f0c0b2] Remove useless override
  574. Author: Dylan K. Taylor <odigiman@gmail.com>
  575. Date: Wed Oct 19 12:39:47 2016 +0100
  576. 1 file changed, 8 deletions(-)
  577. iMac-srv:ClearSky_main Tim$ git cherry-pick 468b3e8d44b81a2cab23b7531c05f05753b72b91
  578. [0.16 45420d1] Flags now work on mobs, but not on players
  579. Author: Dylan K. Taylor <odigiman@gmail.com>
  580. Date: Wed Oct 19 13:58:19 2016 +0100
  581. 1 file changed, 1 insertion(+), 1 deletion(-)
  582. iMac-srv:ClearSky_main Tim$ git cherry-pick 2ffbb452bbd9e56d1ecb82067652ab12829116d4
  583. error: could not apply 2ffbb45... Fix a bunch of metadata bugs, fixed air ticking and added some new API methods
  584. hint: after resolving the conflicts, mark the corrected paths
  585. hint: with 'git add <paths>' or 'git rm <paths>'
  586. hint: and commit the result with 'git commit'
  587. iMac-srv:ClearSky_main Tim$ git add -
  588. fatal: pathspec '-' did not match any files
  589. iMac-srv:ClearSky_main Tim$ git add -u
  590. iMac-srv:ClearSky_main Tim$ git commit
  591. [0.16 bfe68f7] Fix a bunch of metadata bugs, fixed air ticking and added some new API methods
  592. Author: Dylan K. Taylor <odigiman@gmail.com>
  593. Date: Fri Oct 21 12:36:38 2016 +0100
  594. 3 files changed, 50 insertions(+), 9 deletions(-)
  595. iMac-srv:ClearSky_main Tim$ git cherry-pick 2dfca147144b52f417721d401153eb2051a7c09e
  596. [0.16 4c18ad1] Add varint length checks (10 bytes, currently no proper varlong support)
  597. Author: Dylan K. Taylor <odigiman@gmail.com>
  598. Date: Fri Oct 21 14:07:00 2016 +0100
  599. 1 file changed, 10 insertions(+), 2 deletions(-)
  600. iMac-srv:ClearSky_main Tim$ git cherry-pick ce72f634b095b2c53d6491a3e0b13480f66add70
  601. error: could not apply ce72f63... Update some old code
  602. hint: after resolving the conflicts, mark the corrected paths
  603. hint: with 'git add <paths>' or 'git rm <paths>'
  604. hint: and commit the result with 'git commit'
  605. iMac-srv:ClearSky_main Tim$ git add -u
  606. iMac-srv:ClearSky_main Tim$ git add -u
  607. iMac-srv:ClearSky_main Tim$ git commit
  608. [0.16 b235790] Update some old code
  609. Author: Dylan K. Taylor <odigiman@gmail.com>
  610. Date: Fri Oct 21 15:02:42 2016 +0100
  611. 3 files changed, 68 insertions(+), 55 deletions(-)
  612. iMac-srv:ClearSky_main Tim$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!