drtshock
|
b3d4b50749
|
Merge pull request #28 from lifehome/master
We do bake potatoes, don't we?
|
2014-02-16 21:49:14 -06:00 |
|
Ivan Ip
|
a2f70b155b
|
Update Potato.java-- added an oven.
|
2014-02-14 00:39:22 +08:00 |
|
Gregory
|
1e84ed2bc3
|
Update Potato.java
|
2014-02-04 18:31:34 +08:00 |
|
drtshock
|
2f80511d6e
|
Merge pull request #27 from superckl/master
Because this project can't die
|
2014-02-01 22:29:04 -08:00 |
|
superckl
|
c387f3d6af
|
Because this project can't die
|
2014-02-01 23:49:36 -06:00 |
|
drtshock
|
59eb7051b2
|
Merge pull request #24 from ocelotpotpie/master
Updating to 1.7.2. VERY IMPORTANT.
|
2013-11-30 18:16:22 -08:00 |
|
Christian Hogan
|
f5ee757af5
|
Updating to 1.7.2. VERY IMPORTANT.
|
2013-11-30 21:15:30 -05:00 |
|
Kyle Clemens
|
69d2a02b30
|
Added: Pull Request rules
|
2013-11-24 15:16:07 -05:00 |
|
Kyle Clemens
|
78616ce61a
|
Merge pull request #22 from AgentTroll/patch-2
Update Potato.java
|
2013-11-23 17:50:08 -08:00 |
|
AgentTroll
|
fd6f999324
|
Update Potato.java
|
2013-11-23 16:55:30 -08:00 |
|
drtshock
|
7b7e4a7968
|
Merge pull request #21 from CraftThatBlock/patch-1
What about ketchup?
|
2013-11-23 11:11:42 -08:00 |
|
CraftThatBlock
|
a98f2862e8
|
What about ketchup?
|
2013-11-23 14:06:44 -05:00 |
|
Kyle Clemens
|
28c8a6c61a
|
Merge pull request #20 from LaxWasHere/master
Everyone loves broccoli
|
2013-11-22 14:25:56 -08:00 |
|
Lax
|
bcb1e68b08
|
Everyone loves broccoli
|
2013-11-22 14:17:22 -08:00 |
|
Kyle Clemens
|
e18ac3eb14
|
Merge pull request #18 from blha303/master
Added package
|
2013-11-10 07:43:15 -08:00 |
|
blha303
|
5e2ef19615
|
Added package
|
2013-11-10 23:41:03 +08:00 |
|
Kyle Clemens
|
c8f20396aa
|
Merge pull request #17 from blha303/patch-1
Made compiled JAR executable
|
2013-11-10 07:30:28 -08:00 |
|
Steven Smith
|
84e57dd65a
|
Made compiled JAR executable
|
2013-11-10 23:29:41 +08:00 |
|
Kyle Clemens
|
9d471c7259
|
Merge pull request #16 from Tiktalik/master
Update Potato.java
|
2013-11-10 01:26:43 -08:00 |
|
Tiktalik
|
563e5e4c01
|
Update Potato.java
Improved condiment list.
|
2013-11-10 02:24:34 -07:00 |
|
blha303
|
62b45b0590
|
Mavenized
|
2013-11-10 03:01:01 -06:00 |
|
Kyle Clemens
|
c760dfd114
|
Merge branch 'master' of git://github.com/np98765/Potato into np98765-master
Conflicts:
README.md
|
2013-11-10 02:50:42 -05:00 |
|
Kyle Clemens
|
ada908688c
|
Merge pull request #11 from lol768/patch-1
._.
|
2013-11-09 23:46:45 -08:00 |
|
Kyle Clemens
|
6d67d9939e
|
Merge pull request #13 from jkcclemens/master
God PR
|
2013-11-09 23:45:46 -08:00 |
|
Kyle Clemens
|
9d0544e8dc
|
Added: Tuber!
Also did some other stuff.
|
2013-11-10 02:37:13 -05:00 |
|
Gamecube762
|
a7dbfd20c4
|
Fixed Type of Continue in README.md
"Continue" in the last line was typed as "coninue"
|
2013-11-09 17:57:29 -08:00 |
|
lol768
|
8344f524c4
|
._.
|
2013-11-10 00:26:13 +00:00 |
|
NP98765
|
05be34d4d3
|
Tyzoid's typo horrifies and disgusts me.
|
2013-11-09 17:17:22 -07:00 |
|
Iaccidentally
|
e3a04d05ca
|
Is sad day in Latvia. is not potato, is rock.
|
2013-11-09 18:55:09 -05:00 |
|
Iaccidentally
|
124baa59c6
|
implement Glados
|
2013-11-09 18:50:28 -05:00 |
|
drtshock
|
a0df812a38
|
Merge pull request #7 from jkcclemens/master
Fixed: Make Potato compilable
|
2013-11-09 15:23:25 -08:00 |
|
Kyle Clemens
|
4043d8a541
|
Renamed: potato.java -> Potato.java
|
2013-11-09 18:18:09 -05:00 |
|
Kyle Clemens
|
40ad9b2f87
|
Fixed: Make Potato compilable
|
2013-11-09 18:17:49 -05:00 |
|
drtshock
|
16312a9d81
|
Merge pull request #5 from inventorman101/master
Create potato.java
|
2013-11-09 15:09:48 -08:00 |
|
inventorman101
|
059d904573
|
Create potato.java
|
2013-11-09 16:01:25 -07:00 |
|
drtshock
|
8696782d4e
|
Merge pull request #4 from tyzoid/master
Added history of forking the potato.
|
2013-11-09 14:21:32 -08:00 |
|
tyzoid
|
a2f0e07e3f
|
Added history of forking the potato.
|
2013-11-09 17:19:14 -05:00 |
|
drtshock
|
791a98a083
|
Merge pull request #3 from DSH105/master
Love the potato :3
|
2013-11-09 13:33:15 -08:00 |
|
DSH105
|
323d32944f
|
Love the potato
|
2013-11-10 08:25:34 +11:00 |
|
drtshock
|
8aa4d194d6
|
Move sourcream to repo.
|
2013-11-09 15:20:25 -06:00 |
|
drtshock
|
6a4005daa0
|
Host our own images.
|
2013-11-09 14:47:57 -06:00 |
|
inventorman101
|
8c17afd482
|
Update README.md
|
2013-11-09 13:36:30 -06:00 |
|
drtshock
|
f78660e053
|
fork the potato
|
2013-11-09 02:14:36 -06:00 |
|
drtshock
|
c85c2b5896
|
Initial commit
|
2013-11-09 00:10:34 -08:00 |
|