Commit Graph

105 Commits

Author SHA1 Message Date
Jeroen Ketelaar 59af43140f Merge pull request #45 from Parabot/task/version
[TASK] Updated Version
2017-08-31 21:56:38 +02:00
Emma Stone 1fd41568c5 [TASK] Updated Version 2017-08-31 20:46:44 +01:00
Jeroen Ketelaar 1267b9751a Merge pull request #43 from Parabot/bugfix/windows
[BUGFIX] Generating random UUID
2017-08-31 21:25:02 +02:00
Emma Stone 2e573eeae7 [BUGFIX] Generating random UUID
Also reformatted the code
2017-08-31 19:54:37 +01:00
Jeroen Ketelaar 88f8d58c49 Merge pull request #42 from Parabot/master
[MERGE] Master into development
2017-08-31 18:43:07 +02:00
Jeroen Ketelaar d742647471 Merge pull request #41 from Parabot/release/0.25
[RELEASE] Ready for V0.25
2017-08-31 18:39:04 +02:00
Jeroen Ketelaar 56f74d841e Merge branch 'master' into release/0.25 2017-08-31 18:35:36 +02:00
JKetelaar 9059992a8d [RELEASE] Ready for V0.25 2017-08-31 18:35:05 +02:00
Jeroen Ketelaar d1219e4496 Merge pull request #40 from Parabot/development
[MERGE] Development into master
2017-08-31 18:33:25 +02:00
Jeroen Ketelaar c2c799c843 Merge pull request #39 from Parabot/feature/locopk
[FEATURE] Added LocoPK Random
2017-08-31 18:27:08 +02:00
Emma Stone b0f22fff21 [CLEANUP] Removed unused randoms 2017-08-31 16:15:42 +01:00
Emma Stone c4452e0c85 [FEATURE] Added LocoPK Random 2017-08-31 16:12:26 +01:00
Jeroen Ketelaar 9f2f9765ef Merge pull request #38 from PBLord/patch-4
[FEATURE] CombatStone Random
2017-08-25 16:29:30 +02:00
Jeroen Ketelaar e5b5629a62 Merge branch 'development' into patch-4 2017-08-25 16:20:50 +02:00
PBLord 25d8db5c94 [FIX] Logger 2017-08-25 15:07:27 +01:00
PBLord 8e6723b407 Update CombatStone 2017-08-25 14:19:36 +01:00
PBLord 78be0eefb9 NameFix 2017-08-25 13:04:58 +01:00
Jeroen Ketelaar d18b2249af Merge pull request #37 from PBLord/patch-3
[BUGFIX] MysteriousOldMan NPC Id Fix
2017-08-25 13:59:36 +02:00
Jeroen Ketelaar 2947daf0a9 Merge branch 'development' into patch-4 2017-08-25 13:57:37 +02:00
Jeroen Ketelaar 21e4b41e23 Merge branch 'development' into patch-3 2017-08-25 13:55:13 +02:00
Jeroen Ketelaar d79ace4d6c Merge pull request #36 from PBLord/bugfix/npcids
[BUGFIX] Wrong NPC Ids
2017-08-25 13:54:55 +02:00
Jeroen Ketelaar 73fdbcc7ca Merge branch 'development' into patch-3 2017-08-25 13:47:24 +02:00
Emma Stone 066f7d9762 Merge branch 'development' into bugfix/npcids 2017-08-25 12:46:42 +01:00
PBLord f471ceee07 Combat Stone Random 2017-08-25 12:38:46 +01:00
PBLord e2f4c30c52 bugfix/npcids 2017-08-25 12:35:34 +01:00
PBLord 6d438c4224 bugfix/npcids 2017-08-25 12:32:16 +01:00
PBLord a510178462 bugfix/npcids 2017-08-25 12:28:43 +01:00
Jeroen Ketelaar 6a0bbc0cce Merge pull request #34 from Parabot/feature/mac-address-fix
[FEATURE] Fix for mac address for Dreamscape
2017-04-22 15:16:47 +02:00
Emma Stone 0268187204 [TASK] Renamed KEYS to keys 2017-04-22 14:07:13 +01:00
Emma Stone 1b344c98e4 [BUGFIX] Generating a new mac
They block the login with `empty_mac` so I’m generating a new mac.
2017-04-22 13:54:37 +01:00
Emma Stone 5779b6132e [FEATURE] Fix for mac address for Dreamscape 2017-04-22 13:17:12 +01:00
Jeroen Ketelaar 5b0fd906d5 Merge pull request #33 from Parabot/bugfix/banfile
[BUGFIX] Added BanFile add
2017-02-03 19:48:34 +01:00
Emma Stone 7e64c6afba [BUGFIX] Added BanFile add 2017-02-03 16:03:34 +00:00
Jeroen Ketelaar 4e9a1e964e Merge pull request #32 from Parabot/development
[MERGE] Development into master
2017-02-03 00:33:46 +01:00
Jeroen Ketelaar 1a41df754c Merge pull request #31 from Parabot/bugfix/elkoy-question-solver
[BUGFIX] Added QuestionSolver and fixed ID
2017-02-02 23:51:14 +01:00
JKetelaar 8252b5c2e3 [BUGFIX] Added QuestionSolver and fixed ID 2017-02-02 23:44:30 +01:00
Jeroen Ketelaar cdf56a531c Merge pull request #30 from Parabot/development
[MERGE] Development into master
2017-02-02 23:38:00 +01:00
Jeroen Ketelaar 38307827ec Merge pull request #29 from Parabot/release/0.23
[BUGFIX] Set correct version for release
2017-02-02 23:30:44 +01:00
JKetelaar 6d614f6cb4 [BUGFIX] Set correct version for release 2017-02-02 23:19:41 +01:00
Jeroen Ketelaar d7becbb60a Merge pull request #28 from Parabot/development
[MERGE] Development into master
2017-02-02 23:14:32 +01:00
Jeroen Ketelaar 46ff1d5bbc Merge pull request #27 from Parabot/feature/anti-bot-detector
[FEATURE] Added Anti bot detection for Elkoy
2017-02-02 22:53:35 +01:00
JKetelaar aeaf58a3b8 [BUGFIX] Removed PacketBlockIntercepter add 2017-02-02 20:40:01 +01:00
JKetelaar f0e971f269 Merge branch 'development' of github.com:Parabot/Randoms into feature/anti-bot-detector
# Conflicts:
#	src/main/java/org/parabot/randoms/Core.java
2017-02-02 20:28:03 +01:00
Jeroen Ketelaar 5db0feb52d Merge pull request #26 from Parabot/bugfix/trianglesandwich
[BUGFIX] Fixed a null pointer in the Triangle Sandwich random
2017-02-02 20:10:47 +01:00
JKetelaar bd2eaa92fe [FEATURE] Added Anti Bot Detector for Elkoy 2017-02-02 20:01:29 +01:00
Emma Stone 59d877104b [BUGFIX] Fixed a null pointer
Also removed unused randoms and cleaned up code
2017-02-01 20:46:02 +00:00
Jeroen Ketelaar 3e6a2365ce Merge pull request #25 from Parabot/feature/mouse-on-screen
[FEATURE] Added Mouse on screen random
2017-01-30 14:33:54 +01:00
JKetelaar 78f98b7570 [FEATURE] Added Mouse on screen random
Thanks to @fryslan
2017-01-30 11:05:32 +01:00
Jeroen Ketelaar b985598013 Merge pull request #24 from Parabot/feature/logout-disabler
[FEATURE] Added the logout disabler random
2017-01-27 13:30:08 +01:00
Emma Stone b2f6868b0e [FEATURE] Added the logout disabler random
Also removed the question solver random until it’s been fixed
2017-01-27 00:50:50 +00:00