please work

data/planetdata.lua

@@ -1,45 +1,14 @@
 planetdata = {
 	{
 		x = 0, y = 0,
-<<<<<<< Updated upstream
-		r = 500000, m = 1e9,
-=======
-<<<<<<< Updated upstream
-		r = 500000, m = 5e15,
->>>>>>> Stashed changes
-		xSpeed = 0, ySpeed = 0,
-=======
 		r = 500000, m = 1e12,
 		xSpeed = 0, ySpeed = 100,
->>>>>>> Stashed changes
 		name = "Testos",
 		colour = {42, 04, 20},
 		parent = "star"
 	},
 	{
 		x = 2000000, y = 0,
-<<<<<<< Updated upstream
-		r = 100000, m = 4e10,
-		xSpeed = 0, ySpeed = 50,
-		name = "Deez",
-		colour = {50, 50, 50},
-		parent = 1
-	},
-	{
-		x = 2200000, y = 0,
-		r = 10000, m = 1e9,
-		xSpeed = 0, ySpeed = 100,
-		name = "Ligos",
-		colour = {10, 50, 20},
-		parent = 2
-=======
-<<<<<<< Updated upstream
-		r = 40000, m = 4e7,
-		xSpeed = 0, ySpeed = 12000,
-		name = "Deez",
-		colour = {50, 50, 50},
-		parent = 1
-=======
 		r = 100000, m = 4e9,
 		xSpeed = 0, ySpeed = 175,
 		name = "Deez",
@@ -53,8 +22,6 @@ planetdata = {
 		name = "Ligos",
 		colour = {10, 50, 20},
 		parent = 2
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 	}
 }
 

data/starshipTypes.lua

@@ -4,26 +4,11 @@ starshipTypes = {
         name = "Classic Orbiter",
         description = "Dolor fugiat irure sit aliqua labore. Culpa voluptate occaecat anim exercitation proident sint ex dolor. Officia in labore sint Lorem ea. Ad minim aliqua aliqua non commodo qui in ea sit excepteur excepteur qui.",
         impacttolerance = 0.5,
-<<<<<<< Updated upstream
-        mass = 10,
-        speed = 0.05,
-        specials = {"orbitSync"}
-        --TEXTURE HERE?
-=======
         mass = 100000, -- idk, feels better but holy fuck thats a thicc ass boi xD
         speed = 0.05,
         specials = {"orbitSync"},
         texture = texture.player.orbiter
->>>>>>> Stashed changes
     }
 }
 
 return starshipTypes
-<<<<<<< Updated upstream
-
-
-
-
-
-=======
->>>>>>> Stashed changes

import.lua

@@ -8,15 +8,7 @@ info = require "data/info"
 texture = require "textures/textures"
 controls = require "data/controls"
 settings = require "data/settings"
-<<<<<<< Updated upstream
-texture = require "textures/textures"
-<<<<<<< Updated upstream
-starshipTypes = require "data/starshipTypes"
-=======
-=======
 starshipTypes = require "data/starshipTypes"
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 
 -- Game Source:
 calc = require "src/calc"

main.lua

@@ -24,16 +24,8 @@ function love.load()
 	loadPlanets()
 
 	local spawnPlanet = planet[1]
-<<<<<<< Updated upstream
-	player = Player(spawnPlanet.x, spawnPlanet.y-spawnPlanet.r-1, "orbiter")
-=======
-<<<<<<< Updated upstream
-	player = Player(spawnPlanet.x, spawnPlanet.y-spawnPlanet.r-1)
-=======
 	player = Player(spawnPlanet.x, spawnPlanet.y-spawnPlanet.r-1, "orbiter")
 	player.xSpeed, player.ySpeed = spawnPlanet.xSpeed, spawnPlanet.ySpeed
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 	gui = Gui(1)
 	effects = {}
 end

src/class/Planet.lua

@@ -45,20 +45,9 @@ function Planet:getSpeed()
 end
 
 function Planet:updatePosition()
-<<<<<<< Updated upstream
-	self.x = self.x + self.xSpeed + self.orbitalX
-	self.y = self.y + self.ySpeed + self.orbitalY
-=======
-<<<<<<< Updated upstream
-	self.x = self.x + self.xSpeed
-	self.y = self.y + self.ySpeed
->>>>>>> Stashed changes
-	debug("Updating position of planet " .. self.name .. ": " .. self.x .. " " .. self.y)
-=======
 	self.x = self.x + self.xSpeed + self.orbitalX
 	self.y = self.y + self.ySpeed + self.orbitalY
 	--debug("Updating position of planet " .. self.name .. ": " .. self.x .. " " .. self.y)
->>>>>>> Stashed changes
 end
 
 function Planet:attract(dt)		--Planet doing the attracting, divided in two parts:	

src/class/Player.lua

@@ -30,17 +30,9 @@ function Player:init(tempX, tempY, tempT)
 
 	-- Status:
 	self.exploding = false
-<<<<<<< Updated upstream
-
-	--TEXTURE HERE?
-=======
-<<<<<<< Updated upstream
-=======
 
 	--TEXTURE HERE?
 	self.texture = love.graphics.newImage(starshipTypes[tempT].texture)
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 end