{"action":"created","issue":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14602","labels_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14602/labels{/name}","comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14602/comments","events_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14602/events","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14602","id":123814146,"number":14602,"title":"Mainline Medieval Stuff mod, part 2","user":{"login":"Darkyhard","id":8814734,"avatar_url":"https://avatars.githubusercontent.com/u/8814734?v=3","gravatar_id":"","url":"https://api.github.com/users/Darkyhard","html_url":"https://github.com/Darkyhard","followers_url":"https://api.github.com/users/Darkyhard/followers","following_url":"https://api.github.com/users/Darkyhard/following{/other_user}","gists_url":"https://api.github.com/users/Darkyhard/gists{/gist_id}","starred_url":"https://api.github.com/users/Darkyhard/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Darkyhard/subscriptions","organizations_url":"https://api.github.com/users/Darkyhard/orgs","repos_url":"https://api.github.com/users/Darkyhard/repos","events_url":"https://api.github.com/users/Darkyhard/events{/privacy}","received_events_url":"https://api.github.com/users/Darkyhard/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":5,"created_at":"2015-12-24T15:35:22Z","updated_at":"2015-12-25T18:28:49Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14602","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14602","diff_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14602.diff","patch_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14602.patch"},"body":"Move some stuff from Medieval Stuff mod, mostly weapons.\r\nMust be merged after part 1 ( #14601 ) to avoid errors.\r\n\r\nFull list of moved items:\r\n\r\nMelee:\r\n\r\narming sword (+fake) (+recipe) (+itemgroups)\r\nlongsword (+fake) (+recipe) (+itemgroups)\r\nestoc (+fake) (+recipe) (+itemgroups)\r\nhalberd (+fake) (+recipe) (+itemgroups)\r\nscimitar (+fake) (+recipe) (+itemgroups)\r\nglaive (+recipe) (+itemgroups)\r\nnaginata (+recipe) (+itemgroups)\r\njian (+fake) (+recipe) (+itemgroups)\r\nqiang (+recipe) (+itemgroups)\r\n\r\nRanged:\r\n\r\nfire lance (+recipe) (+itemgroups)\r\n\r\nAmmo:\r\n\r\nfire lance charge (+recipe) (+itemgroups)\r\nfire lance shot (+recipe) (+itemgroups)\r\n"},"comment":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/comments/167256495","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14602#issuecomment-167256495","issue_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14602","id":167256495,"user":{"login":"Zireael07","id":4525388,"avatar_url":"https://avatars.githubusercontent.com/u/4525388?v=3","gravatar_id":"","url":"https://api.github.com/users/Zireael07","html_url":"https://github.com/Zireael07","followers_url":"https://api.github.com/users/Zireael07/followers","following_url":"https://api.github.com/users/Zireael07/following{/other_user}","gists_url":"https://api.github.com/users/Zireael07/gists{/gist_id}","starred_url":"https://api.github.com/users/Zireael07/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zireael07/subscriptions","organizations_url":"https://api.github.com/users/Zireael07/orgs","repos_url":"https://api.github.com/users/Zireael07/repos","events_url":"https://api.github.com/users/Zireael07/events{/privacy}","received_events_url":"https://api.github.com/users/Zireael07/received_events","type":"User","site_admin":false},"created_at":"2015-12-25T18:28:49Z","updated_at":"2015-12-25T18:28:49Z","body":"Most git clients have a tool to show you what causes conflicts. Try SourceTree or some other GUI tool of your choice."}}