flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,843 Commits 1 Branch 0 Tags
87a7d3ec64552f7ab63715656e8ba2b519994d76
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Harkness e03851a78f Added ltdTM to BACKERS 2016-06-23 15:24:25 +01:00
Alexander Harkness bac71cb513 Fixed remaining issue from #3199 (#3207) 
Added an alias for oak boats as oakboat, as the other boats have.
 2016-05-29 16:27:11 +02:00
Alexander Harkness 34c92e8d32 Add JimSVMI83 to backers file. 2016-05-21 16:17:59 +01:00
Alexander Harkness fea664f2cf Some 1.9 Crafting Recipes and Items. (#3199) 2016-05-20 09:33:56 +02:00
Alexander Harkness a75fb13f99 Added Utking to backers file. 2016-05-16 10:23:11 +01:00
Alexander Harkness e0e3f396f2 Proper fix for #3136 (#3143) 2016-04-18 23:04:13 +01:00
Alexander Harkness 8447e4e333 Merge pull request #3137 from cuberite/issue3136 
Issue3136
 2016-04-13 07:05:11 +01:00
Alexander Harkness 8658d4ddd6 Fixed port override code. 2016-04-12 21:40:09 +01:00
Alexander Harkness 3b3fc97339 Merge pull request #3132 from LogicParrot/readme 
Rewrite README.md's contribution section
 2016-04-07 11:45:58 +01:00
Alexander Harkness dc1e4698b4 Merge pull request #3128 from LogicParrot/typo 
Readme typo fix
 2016-04-06 11:35:00 +01:00
Alexander Harkness 6d1d223d04 Merge pull request #3109 from LogicParrot/moveToNewWorld 
MoveToWorld defaults to spawnpoint
 2016-03-30 11:38:24 +01:00
Alexander Harkness 68edcd47e1 Merge pull request #3093 from mathias-github/patch-2 
Added donator to list
 2016-03-26 08:28:41 +00:00
Alexander Harkness bd2fc7716c Merge pull request #3079 from mathias-github/patch-1 
Fixed melon block recipe
 2016-03-14 17:57:54 +00:00
Alexander Harkness f9258892d1 Merge pull request #3040 from Woazboat/master 
Added more information about contributing to Cuberite
 2016-02-27 10:07:05 +00:00
Alexander Harkness fa0159b082 Merge pull request #3032 from cuberite/3030-fix 
Fix #3030
 2016-02-20 20:11:03 +00:00
Alexander Harkness e628908a7d Fix #3030 
Logicparrot's instructions
 2016-02-20 18:42:43 +00:00
Alexander Harkness 7901b9b80a Merge pull request #3029 from mathias-github/master 
Added BACKERS to list of files in Windows build
 2016-02-19 20:45:11 +00:00
Alexander Harkness ac5170c7c4 Correct typo in documentation. 2016-02-05 16:45:55 +00:00
Alexander Harkness b5437c9a77 Merge pull request #2913 from mathias-github/master 
MCServer to Cuberite
 2016-01-30 16:01:19 +00:00
Alexander Harkness 1f9908c712 Merge pull request #2848 from Nakkar/master 
Fix for issue #2218
 2016-01-11 19:09:23 +00:00
Alexander Harkness 831270f74c Merge pull request #2825 from Gargaj/snowlayers 
fix crafting recipe for snow layers
 2015-12-27 14:02:38 +00:00
Alexander Harkness 23e2bc5042 Added analytics to APIDump 2015-12-26 14:10:53 +00:00
Alexander Harkness 16d0bc10a4 Removed offending tr1 references. 2015-12-22 19:55:00 +00:00
Alexander Harkness 2b27bf9f22 Merge pull request #2796 from cuberite/MojangCert 
Added GeoTrust Root Certificate
 2015-12-22 16:39:09 +00:00
Alexander Harkness 01bd614b86 HTTPS Newsletter 2015-12-19 21:29:00 +00:00
Alexander Harkness f764df1a3a Merge pull request #2778 from cuberite/httpschanges 
Added HTTPS links wherever they are supported.
 2015-12-19 14:51:20 +00:00
Alexander Harkness 8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
Alexander Harkness 05e39b249b Merge pull request #2769 from cuberite/FastNBTAsserts 
Check for invalid tags when reading a compound tag
 2015-12-18 14:40:23 +00:00
Alexander Harkness 4b10146b2e Merge pull request #2727 from Gargaj/patch-4 
Test for correct coordinates when fishing
 2015-12-10 21:04:45 +00:00
Alexander Harkness ae850e7b79 Merge pull request #2688 from bendl/master 
Fixed 'Install on DigitalOcean' link in README.md
 2015-11-24 18:42:32 +00:00
Alexander Harkness 68218f6ae6 Merge pull request #2683 from Gargaj/patch-1 
add Golden Carrot
 2015-11-23 16:47:33 +00:00
Alexander Harkness 38a01cec75 Merge pull request #2660 from cuberite/worktycho-patch-2 
Fix musl + clang 3.6 compile error
 2015-11-20 16:53:12 +00:00
Alexander Harkness 85a3076b19 Fixed some markdown. 2015-11-15 16:31:53 +00:00
Alexander Harkness 6bc2b9600b Merge pull request #2648 from cuberite/getting-star 
Minor documentation changes.
 2015-11-15 16:29:17 +00:00
Alexander Harkness 0ea9890e09 Fixed typo in getting-started. 2015-11-15 11:22:06 +00:00
Alexander Harkness 69d8e2fe6b Fix api docs link. 2015-11-15 11:19:48 +00:00
Alexander Harkness 770dca1b7a Update getting started to new information. 2015-11-15 11:19:03 +00:00
Alexander Harkness b32d13ae2d Merge pull request #2628 from Gargaj/creeperdeflate 
Idle/deflating creeper should send -1
 2015-11-09 19:18:12 +00:00
Alexander Harkness 2aaf30e406 Merge pull request #2619 from cuberite/worktycho-patch-1 
Use .travis.yml to whitelist coverity_scan for push builds.
 2015-11-08 21:33:38 +00:00
Alexander Harkness 20eaa33400 Merge pull request #2597 from cuberite/faviconChange 
Changed server favicon to more commonly used one
 2015-11-04 07:15:15 +00:00
Alexander Harkness 8eba35e283 Merge branch 'master' into chunkprepare-deadlock 2015-11-02 20:18:49 +00:00
Alexander Harkness 51948058ad Merge pull request #2594 from cuberite/bearbin-patch-1 
Fix shell location.
 2015-11-02 20:18:17 +00:00
Alexander Harkness 231fa29174 Fix shell location. 2015-11-02 19:14:49 +00:00
Alexander Harkness 7e4c56ce0d Fix deadlock, resolves #2521 2015-11-02 18:21:35 +00:00
Alexander Harkness ad8b711b4d Merge pull request #2587 from cuberite/bountysource-not-gratipay 
Removed mentions of Gratipay, replaced with Bountysource.
 2015-11-01 16:28:15 +00:00
Alexander Harkness fce6daef2c Removed mentions of Gratipay, replaced with Bountysource. 2015-11-01 15:50:47 +00:00
Alexander Harkness cb551e9512 Fixed typo that slipped through #2584 2015-10-31 22:32:50 +00:00
Alexander Harkness b4f464976a Fixed help text again, another part had changed. 2015-10-31 22:25:21 +00:00
Alexander Harkness 837b5e0d14 Fixed outdated help text in easyinstall. 2015-10-31 22:22:59 +00:00
Alexander Harkness 2e836ed4e9 Fixed typo in description. 2015-10-31 22:19:31 +00:00
Alexander Harkness b13fd00ec4 Merge pull request #2584 from bibo38/firepotion 
Implemented the FireResistence potion effects.
 2015-10-31 22:18:27 +00:00
Alexander Harkness 9c270d522c Merge pull request #2549 from cuberite/TouchGround 
Debug mode: Fixed assertion, if player below y < 0
 2015-10-31 15:12:49 +00:00
Alexander Harkness d290b1e48a Merge pull request #2574 from Schwertspize/pressure-plate-fix 
Pressure plate fix
 2015-10-28 21:29:10 +00:00
Alexander Harkness 54583d74b4 Merge pull request #2576 from Schwertspize/patch-1 
Added myself to list, ran it through `sort -f`
 2015-10-28 19:17:09 +00:00
Alexander Harkness 745e6bd0b8 Merge pull request #2575 from Schwertspize/patch-1 
remove contentless bullet point
 2015-10-28 18:51:41 +00:00
Alexander Harkness d14c8fa446 Fix wrong teleport permission. (solves #2369) 2015-10-28 08:24:48 +00:00
Alexander Harkness 8eeb25dac6 Merge pull request #2394 from cuberite/FixCustomRecipes 
Fixed custom recipes result clientside bug.
 2015-07-26 15:26:39 +01:00
Alexander Harkness b7114af5ae Merge pull request #2372 from jammet/patch-7 
Update crafting.txt
 2015-07-19 13:51:16 +01:00
Alexander Harkness 2603013d79 Merge pull request #2036 from cuberite/sign-metamirror 
Should Fix sign flipping.
 2015-07-15 14:58:28 +01:00
Alexander Harkness b650508d4b Merge pull request #2253 from jammet/patch-7 
Update crafting.txt
 2015-06-16 17:37:32 +01:00
Alexander Harkness 49e94375c0 Merge pull request #2252 from jammet/patch-7 
Update crafting.txt
 2015-06-16 16:47:25 +01:00
Alexander Harkness 88d5891a82 Merge pull request #2248 from cuberite/clang3.6 
Fixed override
 2015-06-15 18:42:13 +01:00
Alexander Harkness ce93cfc34c Merge pull request #2193 from nounoursheureux/master 
Added HOOK_KILLED
 2015-06-13 11:59:07 +01:00
Alexander Harkness ee3082a3c5 If defined, not just if. 2015-06-12 12:37:22 +01:00
Alexander Harkness 070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Alexander Harkness 001305247f Merge pull request #2231 from cuberite/SelfTestRegistering 
SelfTests are registered and executed after logging framework init.
 2015-06-12 11:00:47 +01:00
Alexander Harkness d3976917b1 Update gratipay 2015-06-11 19:32:13 +01:00
Alexander Harkness 47d78ab99c Merge pull request #2229 from cuberite/readme-namechange 
Name change updates.
 2015-06-11 19:31:02 +01:00
Alexander Harkness d4eb98bcae Update GETTING-STARTED.md 2015-06-11 17:35:51 +01:00
Alexander Harkness f3edfc0be4 Update CONTRIBUTORS 2015-06-11 17:34:10 +01:00
Alexander Harkness 372020b524 Update LICENSE 2015-06-11 17:33:37 +01:00
Alexander Harkness 79f51c6aff Name change updates. 2015-06-11 17:32:49 +01:00
Alexander Harkness 7a317a6a59 Update README.md 2015-06-11 17:03:53 +01:00
Alexander Harkness cb0618326f More name change. 2015-06-11 16:59:34 +01:00
Alexander Harkness 86d18a4ac2 More name changes. 2015-06-11 16:56:34 +01:00
Alexander Harkness f163cb1ebf Update build download links. 2015-06-09 16:24:36 +01:00
Alexander Harkness 1e77f27191 Merge pull request #2144 from mc-server/comparators 
Redstone improvements [SEE DESC]
 2015-06-09 09:15:08 +01:00
Alexander Harkness 2ea316b746 Merge pull request #2212 from mc-server/revert-2179-ChunkQueueCollapsing 
Revert "Chunk queue collapsing"
 2015-06-07 20:47:47 +01:00
Alexander Harkness f1a3535d6e Merge pull request #2210 from nounoursheureux/bucket-craft 
Cake crafting now give back the bucket
 2015-06-07 14:43:16 +01:00
Alexander Harkness e2c4a0a595 Merge pull request #2211 from jan64/master 
Fix incorrent experience sending for 1.7 clients
 2015-06-07 14:41:27 +01:00
Alexander Harkness 4ece4a61f6 Merge pull request #2153 from mc-server/gcc5 
Update SQLite
 2015-06-06 13:52:58 +01:00
Alexander Harkness 19491f8354 Merge pull request #2207 from mc-server/LineBlockTracerFix 
Fixed overshoot in cLineBlockTracer.
 2015-06-05 11:03:19 +01:00
Alexander Harkness 150be79443 Merge pull request #2178 from jammet/patch-7 
Fix Daylightsensor recipe
 2015-06-01 07:31:16 +01:00
Alexander Harkness ddb173b289 Merge pull request #2173 from mc-server/CleanCmake 
Moved shared cmake flags to the CMAKE_C_FLAGS var
 2015-05-30 14:07:18 +01:00
Alexander Harkness 4504ec7a67 Updated MagicCarpet submodule. Fixes #2155 2015-05-30 13:06:46 +01:00
Alexander Harkness 28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00
Alexander Harkness 97ee861c20 Merge pull request #2171 from SafwatHalaby/fence 
PF - Handle all fencetypes
 2015-05-30 11:13:59 +01:00
Alexander Harkness 0afdbeab29 Merge pull request #2165 from SafwatHalaby/creeper 
Fixed creeper explosions
 2015-05-30 08:05:56 +01:00
Alexander Harkness 1487f57905 Merge pull request #2151 from SafwatHalaby/wolf 
AI - Tweaked wolf speed and teleport threshold
 2015-05-28 07:52:30 +01:00
Alexander Harkness da4a76bb50 Merge pull request #2061 from mc-server/fixes 
Fixes
 2015-05-27 12:21:17 +01:00
Alexander Harkness 0fb7628e96 Merge pull request #2143 from jammet/patch-6 
Corrected Cookie recipe
 2015-05-26 18:41:33 +01:00
Alexander Harkness fffc8dce21 Merge pull request #2140 from mc-server/Plugins-duping 
Only add default plugins if there are not any plugins
 2015-05-25 21:24:34 +01:00
Alexander Harkness 150024265e Merge pull request #2135 from linnemannr/master 
Support building on FreeBSD
 2015-05-25 07:07:18 +01:00
Alexander Harkness d50c8f073c Merge pull request #2114 from cengizIO/master 
Fix #2105 - Add gcc to Travis CI compilers list
 2015-05-24 15:45:03 +01:00
Alexander Harkness ae55723c3c Update CONTRIBUTORS 2015-05-24 09:28:28 +01:00
Alexander Harkness 028cfe660a Merge pull request #2129 from Seadragon91/master 
Fixed item name
 2015-05-24 09:27:02 +01:00
Alexander Harkness 45012b72e7 Wolves don't spawn in rivers. 2015-05-24 07:28:17 +01:00
Alexander Harkness febc8529b1 Fix gamemode not changing properly. 
Should fix #604
 2015-05-23 19:31:33 +01:00
Alexander Harkness 97a418f6c1 Merge pull request #2116 from mc-server/CMakeCacheOptions 
Add build_tools and Self_test as cache options, so that CLion can det…
 2015-05-23 14:46:12 +01:00
Alexander Harkness 3a27fabbab Merge pull request #2103 from beeduck/Issue1980 
Fixed players head visible when in spectator mode
 2015-05-23 11:56:39 +01:00