granny
642956fe61
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@850b736 Close PRs opened from orgs or bot accounts (#10281 )
PaperMC/Paper@54a2340 check if itemstack is stackable first (#10285 )
PaperMC/Paper@9c4bb0d add rich message component support to configuration (#10225 )
PaperMC/Paper@8870d22 Fire EntityDamageByEntityEvent for unowned wither skulls patch (#10244 )
PaperMC/Paper@bbc03d8 improve BanList types (#10239 )
PaperMC/Paper@ce5c8dd Configurable max block/fluid ticks (#10266 )
PaperMC/Paper@880fef7 Deprecate extra ban methods with raw BanEntry (#9580 )
PaperMC/Paper@60218cd Don't tick empty worlds (#9025 )
PaperMC/Paper@b21eb4d add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta (#10245 )
PaperMC/Paper@89d51d5 Allow enabling sand duping (#10191 )
PaperMC/Paper@6ad63fb Per world ticks per spawn settings (#6891 )
2024-03-03 23:38:36 -08:00
granny
70a76c42bf
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242 )
2024-02-11 21:56:58 -08:00
granny
6f17a3da52
add back pufferfish patches \o/
2023-12-25 20:15:34 -08:00
granny
18ee893c60
all patches applied \o/
2023-12-07 16:04:02 -08:00
granny
1adf78b91a
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@c95bc5f Don't unpack loot table for TEs not in world (#9918 )
PaperMC/Paper@6675d13 Fix strikeLightningEffect powers lightning rods & clears copper (#9780 )
PaperMC/Paper@63e77b5 Add Enchantment cost API (#9856 )
PaperMC/Paper@d8847bc Updated Upstream (Bukkit/CraftBukkit) (#9922 )
PaperMC/Paper@dd47ec6 Add Entity Movement Direction API (#7085 )
PaperMC/Paper@9ee60ec Add aggressive mob API (#9838 )
PaperMC/Paper@531ef27 Use ApiStatus.Internal instead of Deprecated (#9042 )
PaperMC/Paper@9548629 Add hand to fish event for all player interactions (#9929 )
PaperMC/Paper@aee3830 Deprecate Material#isInteractable (#9216 )
PaperMC/Paper@a506b48 Fix several issues with EntityBreedEvent (#8677 )
PaperMC/Paper@f186318 Run the chat callback on the main thread as expected (#9935 )
2023-11-12 01:44:08 -08:00
granny
c5c7609d0b
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488 )
PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615 )
PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604 )
PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621 )
PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600 )
PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null
PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462 )
PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643 )
PaperMC/Paper@666a214 [ci skip] rebuild patches
2023-08-20 19:11:32 -07:00
granny
0e36fd08b8
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485 )
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570 )
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463 )
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347 )
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464 )
2023-08-05 20:40:50 -07:00
granny
b21daa9622
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@e16fefb [ci skip] add 'accepted' to Done project category (#9429 )
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428 )
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518 )
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440 )
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448 )
2023-07-05 20:32:26 -07:00
granny
991719aa9e
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@c1ea550 Remove more outdated config settings (#9358 )
PaperMC/Paper@3a03739 Add method to get ungenerated chunk from long key (#9254 )
PaperMC/Paper@072b78a Add trail ruins structure set seed in spigot config (#9327 )
PaperMC/Paper@faf9a65 Disable BukkitMirrorTest
PaperMC/Paper@873533b Add method to remove all active potion effects (#9361 )
PaperMC/Paper@275173e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@976b95c Temp: Pre-init PlayerChunkLoaderData in order to prepopulate the BFS lookup cache because potatos (Closes #9338 )
PaperMC/Paper@d6d4c78 Move some Folia API to Paper for easy compat (#9360 )
PaperMC/Paper@b1fe756 Revert "Move some Folia API to Paper for easy compat (#9360 )"
PaperMC/Paper@1f5bec7 Pull Folia API take two
PaperMC/Paper@3756f5b Properly Cancel Usable Items (#9225 )
2023-06-20 15:54:20 -07:00
granny
91bfaff5af
add back pufferfish patches
2023-06-14 23:11:18 -07:00
Ben Kerllenevich
bf99a800e0
prepare for 1.20 work tomorrow
2023-06-07 20:24:56 -04:00
Ben Kerllenevich
ead09e2bf6
Implement NSA-Mandated Spyware
...
Paper Changes:
PaperMC/Paper@956062a Add transient modifiers (#9244 )
PaperMC/Paper@d8e0759 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@14cfd64 Schedule several things for removal in 1.21 (#9041 )
PaperMC/Paper@175a774 [ci skip] Use a separate interface for bootstrapping (#9267 )
PaperMC/Paper@bc4a664 Paper Plugins Dependency Format Update (#9160 )
Pufferfish Changes:
pufferfish-gg/Pufferfish@cadfa71 Fix config bugs
2023-06-07 13:02:36 -04:00
granny
3b02c0439a
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@ab7bc3f Remove javadoc that doesn't apply to Paper (#9206 )
PaperMC/Paper@57fdc66 Undeprecate Server#getMap (#9185 )
PaperMC/Paper@f8603a4 Avoid Lazy Initialization for Enum Fields (#9210 )
PaperMC/Paper@5b66d33 Call EntityChangeBlockEvent for frogs egg (#9213 )
PaperMC/Paper@4ba5aac More accurate isInOpenWater impl (#9194 )
PaperMC/Paper@a61b484 Fix MC-224454 (#9195 )
PaperMC/Paper@b681760 Fix note block sound property on player heads (#9158 )
PaperMC/Paper@bcd8dc2 Use the spigot config for mangrove propagule / torchflower growth (#8597 )
2023-05-16 13:13:38 -07:00
granny
bd5c4b67e6
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@06fdc02 [ci skip] Correct upstream/paper javadoc (#8286 )
PaperMC/Paper@11ab383 Don't use plugin-profiling to enable timings
2023-03-31 00:12:09 -07:00
granny
a0077699e6
include pufferfish patches
2023-03-22 06:30:53 -07:00
granny
1dea120002
finish applying patches for 1.19.4
2023-03-15 05:49:00 -07:00
BillyGalbreath
2f9418614c
Add back Pufferfish patches
2022-12-15 07:42:58 -06:00
BillyGalbreath
d78268326a
Update to 1.19.3!
2022-12-09 06:02:52 -06:00
BillyGalbreath
ec75e5964a
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315 )
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316 )
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373 )
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253 )
2022-09-24 08:04:00 -05:00
BillyGalbreath
b1925ac31f
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270 )
2022-08-09 08:39:25 -05:00
BillyGalbreath
ff0bea3098
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023 )
PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092 )
PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674 )
PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094 )
2022-07-04 15:39:33 -05:00
BillyGalbreath
4f47e9c368
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@9797f08 Sync Starlight SaveUtil with 1.1.1
PaperMC/Paper@ed9cf5c Fix missing null check in ChunkGenerator#findNearestMapStructure
PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015 )
Pufferfish Changes:
pufferfish-gg/Pufferfish@892ec46 Fix minecart loading bug. PurpurMC/Purpur#1008
pufferfish-gg/Pufferfish@8780a38 Updated Upstream (Paper)
2022-06-20 23:09:28 -05:00
granny
54fbbccdad
add missing api patch
2022-06-10 23:39:44 -07:00
Ben Kerllenevich
e217008618
maybe we API
2022-06-07 14:53:59 -04:00
granny
5f07aff44c
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@7045f18 Change link to screamingsandals
PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792 )
PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800 )
PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835 )
PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837 )
Pufferfish Changes:
pufferfish-gg/Pufferfish@629b5b3 Updated Upstream (Paper)
2022-05-21 03:26:59 -07:00
Encode42
492436a23b
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@f6a69de Undeprecate getOfflinePlayer (#7773 )
PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787 )
PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037 )
PaperMC/Paper@4219389 Don't tick markers (#7299 )
PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985 )
PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793 )
PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch
PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701 )
PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
2022-05-07 14:07:40 -04:00
granny
5424457174
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@c7d4c01 Ignore invalid jars inside of the updates folder (Fixes #7751 )
PaperMC/Paper@4ecc338 WorldCreator#keepSpawnLoaded (#7673 )
PaperMC/Paper@873bfa6 Remove World#refreshChunk deprecation (#7684 )
PaperMC/Paper@76ed156 Grant temporary immunity from EAR to moving entities (Fixes #7637 ) (#7644 )
PaperMC/Paper@567fce6 Don't apply previous potion when item is potion (fixes #7756 ) (#7757 )
PaperMC/Paper@c449f6a Build updates
PaperMC/Paper@ef6a1a5 Revert to old createProfile(UUID, String) logic (#7723 )
PaperMC/Paper@0f8aa4e Fix NPE for BlockDataMeta#getBlockData (#7670 )
PaperMC/Paper@16f224a Trigger bee_nest_destroyed trigger in the correct place (#7436 )
PaperMC/Paper@caf4a6f Remove or replace a few dumb deprecations (#7760 )
PaperMC/Paper@47f43da Add missing javadoc deprecation msgs for PlayerProfile (#7688 )
PaperMC/Paper@fbbc03a Add EntityDyeEvent and CollarColorable interface (#7625 )
PaperMC/Paper@5b85ee3 Fire CauldronLevelChange on initial fill (#7678 )
PaperMC/Paper@4dc78ae Fix some team color docs and added hasColor (#7602 )
PaperMC/Paper@0bf7c95 Fix opening inv in PlayerRecipeBookClickEvent handler (#7552 )
PaperMC/Paper@d70ac03 fix powder snow cauldrons not turning to water (#7229 )
PaperMC/Paper@ce059b4 Fix V1451 dataconverter stat types
Pufferfish Changes:
pufferfish-gg/Pufferfish@52e42d7 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@7b760fe Fix method profiler config
pufferfish-gg/Pufferfish@65a83aa Updated Upstream (Paper)
2022-04-27 02:02:01 -07:00
granny
d4c11601c7
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733 )
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740 )
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
2022-04-16 05:04:50 -07:00
BillyGalbreath
9947768825
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@855637f Updated Upstream (CraftBukkit) (#7624 )
PaperMC/Paper@5eb61dd Buffer OOB setBlock calls
PaperMC/Paper@7b46444 Properly create profiles with custom name/uuid (#7558 )
PaperMC/Paper@a686ff5 Add more missing entity API (#7592 )
PaperMC/Paper@993f828 Add TameableDeathMessageEvent (#5392 )
PaperMC/Paper@a939d6e Fix generator settings string for flat-type worlds (#7568 )
PaperMC/Paper@ab666a4 Deprecating remaining blockkey methods (#7638 )
PaperMC/Paper@e7d928a Fix EntityChangeBlockEvent#getBlockData for when sheep eats grass block (#7646 )
Pufferfish Changes:
pufferfish-gg/Pufferfish@79b9d86 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a9bdca9 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9b5f954 Update Simple YAML
pufferfish-gg/Pufferfish@b48e951 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2499975 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@6f42f6f Update readme and use LF because we're not savages
2022-03-22 12:37:21 -05:00
BillyGalbreath
4afe68b005
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@9cab01e [ci skip] Update Gradle wrapper to 7.4
PaperMC/Paper@cdb893b Add mid-tick task execution to block ticking
PaperMC/Paper@854f3d3 Put world into worldlist before initing the world
PaperMC/Paper@db81163 Execute mid tick tasks during tile entity ticking
PaperMC/Paper@501834e Fix custom inventory holders (#6199 )
PaperMC/Paper@04a337a Add some missing deprecations to the adventure patch (#7500 )
PaperMC/Paper@b6dad9c Fix desync on teleporting entity on first tick (#7183 )
PaperMC/Paper@2a55e35 Option to have default CustomSpawners in custom worlds (#7493 )
PaperMC/Paper@bfa50ad Custom Potion Mixes (#6744 )
2022-02-23 09:40:25 -06:00
BillyGalbreath
cfe8efe1f0
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454 )
PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115 )
PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414 )
PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343 )
PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751 )
PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392 )
PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471 )
PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472 )
PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command
Pufferfish Changes:
pufferfish-gg/Pufferfish@22f20b2 Fix sentry bug
2022-02-13 20:37:07 -06:00
BillyGalbreath
d89923f642
Updated Upstream (Paper & Pufferfish)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation
PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position
PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432 )
Pufferfish Changes:
pufferfish-gg/Pufferfish@d549dda Improve vanilla parity of suffocation patch
pufferfish-gg/Pufferfish@17b3430 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@bcbaf3e Fix div by zero
2022-02-02 21:10:07 -06:00
BillyGalbreath
ed169a31bd
Add Pufferfish Patches
2022-01-04 23:14:55 -06:00
William Blake Galbreath
69c7c31f9a
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
26c37d99d5 create random seeds for features using SecureRandom
589bf2f1bf Upgrade gson to 2.8.8 (Closes #6370 )
0a6103597b Get entity default attributes (#6449 )
40057019e0 Correctly inflate villager activation bounding box (#6798 )
e5f9241d15 Left handed API (#6775 )
40ee63496c Add advancement display API (#6175 )
9d570042ed Add ItemFactory#getMonsterEgg API (#6772 )
55ca459515 rename method to getSpawnEgg
bb397ba74c Add critical damage API (#6275 )
f47aeafe00 Add Horse Animation API (#5599 )
7a0886180f AT & Mapping fixes (#6809 )
5553432644 docs: Update gradle instructions for Java 16 (#6811 ) [ci skip]
a1f49e4c60 Fix command suggestion leak (#6592 )
9472d38f3c Fix method name for Critical damage (#6813 )
2021-10-21 10:58:20 -05:00
William Blake Galbreath
db65efba2b
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
4276013833 Updated Upstream (Bukkit/CraftBukkit/Spigot)
5344798579 Clean plugin folder logic in extra-jars patch (Fixes #6347 ) (#6619 )
3f2159e43c Unlimited chunk load rate (#6768 )
fc0e6c7e08 Fix off by one for determining server view distance
0a16fb8182 Fix merchant inventories not closing on entity removal (#6544 )
c1644521c9 Do not overload I/O threads with chunk data while flush saving
2021-10-16 12:56:35 -05:00
granny
8ea46a7e26
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a3dfe6d Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722 )
PaperMC/Paper@fdd5c65 Fix CraftCriteria defaults map (#6723 )
PaperMC/Paper@d54e8c5 Support components in command permission msgs (#6676 )
PaperMC/Paper@e155002 Fix EntityPortalExitEvent not being called (#5617 )
PaperMC/Paper@e4d8c47 Update adventure and fix command perm serialization NPE (#6729 )
PaperMC/Paper@0cdeeef Remove unnecessary Velocity repo from server (#6730 )
PaperMC/Paper@a419941 Add download link to the /version command (#6482 )
PaperMC/Paper@8e661c6 Deprecate API methods added by 'Close Plugin Class Loaders on Disable' (#6737 )
PaperMC/Paper@7991c4b Fix upstream block state factories (#6738 )
PaperMC/Paper@bfe5622 Fix EntityPortalExitEvent target location
PaperMC/Paper@3391ccf Discard out of bounds chunks during regionfile header recalculation
PaperMC/Paper@cf4af9f Add config setting for logging player ip addresses. (#6342 )
PaperMC/Paper@6dfc0f5 Add getChangedBlockData() property to BlockPhysicsEvent to expose BlockData (#6743 )
PaperMC/Paper@0d1e187 Fix kicking ops when whitelist is reloaded (MC-171420) (#6742 )
PaperMC/Paper@975f2e5 Filter ip address on join if setting is true (#6748 )
2021-10-08 01:57:27 -07:00
Ben Kerllenevich
5ae3e94dec
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
2021-08-28 08:20:37 -04:00
Ben Kerllenevich
6e1ad89162
merge some patches & re-enable timings
2021-08-20 17:41:02 -04:00
William Blake Galbreath
d783ad703b
Airplane patches
2021-08-18 14:55:29 -05:00
William Blake Galbreath
902a3091e2
Remove Tuinity patches (you will be missed)
2020-03-29 15:13:05 -05:00
William Blake Galbreath
86c5a55f46
Update Tuinity patches
2020-03-25 19:29:47 -05:00
William Blake Galbreath
f2e328d295
Updated Upstream (Paper)
...
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965 , Closes #1851 )
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
2020-03-10 19:30:18 -05:00
William Blake Galbreath
aefaadb08f
Add tuinity.yml and server.properties to timings config tab
2020-03-08 15:27:59 -05:00
William Blake Galbreath
a32448bda1
Merge in Tuinity patches
2020-03-08 12:49:59 -05:00