{"push_id":631279473,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"59e5ee30517100d5f2a065d5c099e138dab0b634","before":"6328603a6f5de8a541e997d627643a009322a47b","commits":[{"sha":"59e5ee30517100d5f2a065d5c099e138dab0b634","author":{"email":"dab6bf51c5431d373abd24d6256d07005353d6ee@gmail.com","name":"edward"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tcore/assets/dick.png\n\tcore/assets/effects/Flame.p\n\tcore/assets/effects/particle.png\n\tcore/assets/effects/rainboom.p\n\tcore/assets/font/black16.fnt\n\tcore/assets/font/black16_0.png\n\tcore/assets/font/black32.fnt\n\tcore/assets/font/black32_0.png\n\tcore/assets/font/black64.fnt\n\tcore/assets/font/black64_0.png\n\tcore/assets/font/white16.fnt\n\tcore/assets/font/white16_0.png\n\tcore/assets/font/white32.fnt\n\tcore/assets/font/white32_0.png\n\tcore/assets/font/white64.fnt\n\tcore/assets/font/white64_0.png\n\tcore/assets/img/Thumbs.db\n\tcore/assets/img/badlogic.jpg\n\tcore/assets/img/player.jpg\n\tcore/assets/img/player.png\n\tcore/assets/jew.jpg\n\tcore/assets/maps/testMap.tmx\n\tcore/assets/maps/tile.png\n\tcore/assets/music/Jimmy-theme.mp3\n\tcore/assets/music/dankMusic.mp3\n\tcore/assets/music/introTheme.mp3\n\tcore/assets/testMap.tmx\n\tcore/assets/textures/Space2.jpg\n\tcore/assets/textures/Texture.png\n\tcore/assets/textures/badlogic.jpg\n\tcore/assets/textures/button.png\n\tcore/assets/textures/dick.png\n\tcore/assets/textures/introScreen.jpg\n\tcore/assets/textures/jew.jpg\n\tcore/assets/textures/player.png\n\tcore/assets/textures/tile.png\n\tcore/assets/tiles/block_pack.pack\n\tcore/assets/tiles/block_pack.png\n\tcore/assets/ui/atlas.pack\n\tcore/assets/ui/atlas.png\n\tcore/assets/ui/button-pack.pack\n\tcore/assets/ui/button-pack.png\n\tcore/assets/ui/button.pack\n\tcore/assets/ui/button.png\n\tcore/assets/ui/menuSkin.json","distinct":true,"url":"https://api.github.com/repos/Xierance/Jimmy/commits/59e5ee30517100d5f2a065d5c099e138dab0b634"}]}