Kyle Clemens
0c64019755
Fixed: Remove useless return
2015-10-01 17:14:10 -04:00
Kyle Clemens
4188d9bbca
Added: .gitattributes to standardize line endings
2015-10-01 17:06:08 -04:00
Kyle Clemens
dcb4331b7b
Updated: Ignore IDEA files
2015-10-01 17:05:13 -04:00
Trent Hensler
ae4a32b73b
Merge pull request #48 from SupaHam/master
...
Remove alien characters from our humanly potato.
2015-10-01 13:46:31 -07:00
Ali Moghnieh
7125634178
Remove alien characters from our humanly potato.
2015-10-01 21:22:35 +01:00
Trent Hensler
5b80fdb79d
Merge pull request #47 from Phroa/patch-1
...
Add @Override annotations
2015-10-01 13:09:28 -07:00
Jack Stratton
af5ed7162f
Add @Override annotations
2015-10-01 22:09:06 +02:00
Trent Hensler
0262767fb7
Merge pull request #46 from DanielShuey/master
...
Update README to use proper domain language
2015-09-01 12:15:57 -05:00
DanielShuey
a5dbd3bea9
Update README to use proper domain language
2015-09-01 16:11:16 +10:00
Trent Hensler
212808a854
Merge pull request #44 from AgentTroll/patch-2
...
Potato is lightweight.
2015-08-26 18:26:15 -05:00
Pierre C
64d5d3cb78
Potato is lightweight.
...
Potato does not need extra synchronization.
2015-07-10 13:10:03 -07:00
Trent Hensler
61580991b1
Merge pull request #43 from mrlolethan/fix/compile-error
...
Fix compile-time error.
2015-05-16 13:28:40 -05:00
MrLolEthan
e9cdedf747
Fix compile-time error.
...
When throwing a NotDeliciousException, the "new" keyword wasn't being used, thus causing it to be interpreted as a method call
2015-05-16 12:17:00 -02:30
rtainc
6a6da383a9
Condiments Must Be Delicious! (v2.0)
2014-10-04 22:14:26 -04:00
Trent
d714b8394c
Merge pull request #39 from xMrMysteri0us/patch-1
...
Add NotDeliciousException
2014-09-29 09:51:19 -05:00
xMrMysteri0us
70368c1a73
Add NotDeliciousException
2014-09-28 13:59:04 +02:00
Trent
4a17b0437b
Merge pull request #35 from aerouk/patch-1
...
Because what does Google have to do with potatoes?
2014-09-01 20:28:24 -05:00
Tom B
579d413543
Because what does Google have to do with potatoes?
2014-09-02 02:25:53 +01:00
drtshock
28a6288b64
Merge pull request #33 from DenialMC/master
...
Fix image
2014-03-12 13:59:10 -05:00
Daniel
db8aa2e86f
Fix image
...
Image was removed from the web server, now replaced with another forked potato image with Imgur.
2014-03-12 16:44:22 +02:00
drtshock
3d2b51720d
Merge pull request #32 from DenialMC/master
...
Update: After a long wait, Potato is finally updated to 1.7.5
2014-03-10 13:50:32 -05:00
Daniel
2f96d050c6
Update: After a long wait, Potato is finally updated to 1.7.5
...
#1 1.7.5-ready
#2 Because the potatoifications say the Potato-god is compiled in Java 6, we must should do so too.
#3 Update compiler and jar maven plugin.
2014-03-10 19:30:01 +02:00
drtshock
c8379887dd
Merge pull request #31 from codename-B/patch-1
...
codename_Potato
2014-02-24 08:36:41 -06:00
Ben
067a8e1d65
Update README.md
...
This fixes an oversight in the initial character set that may misconstrue an imagine of unprofessionalism to the Potato
2014-02-24 10:04:35 +00:00
Kyle Clemens
d15e2073e5
Fixed: Make potato compile
...
Also removed GLaDOS (not really a potato). Added a listCondiments method. Formatted code.
2014-02-17 13:23:42 -05:00
Kyle Clemens
5c3010c4c1
Updated: Potato is now 1.7.4-ready
2014-02-17 13:12:33 -05:00
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
