7a0a801740
Merge pull request #2336 from VikeStep/master
...
[1.8.9] Add EntityTravelToDimensionEvent
2016-01-25 11:07:19 -08:00
960717eb0c
Fixed minor race condition between mouse clicks and TESR in the animation example.
2016-01-25 17:39:43 +03:00
026d179c0d
Add EntityTravelToDimensionEvent
...
Resolve Merge Conflict
Move event call inside conditional
2016-01-25 17:57:52 +10:00
e929199758
Sometimes I forget how much trivial things are missing from Java 6.
2016-01-24 10:10:21 +03:00
e9be24700e
Merge pull request #2331 from RainWarrior/model-animation
...
Model animation system
2016-01-24 10:01:58 +03:00
0710bdf3f5
Model animation system.
...
Main things of interest:
* IAnimationStateMachine - state machine for animations; can load
from json.
* AnimationTESR - automatic TESR for animated models.
* AnimationModelBase - same for entities.
* ITimeValue - time-varying value, used to control animation
parameters from code.
* TESRs can now be batched - look at TESR.renderTileEntityFast +
TE.hasFastRenderer.
* RegionRenderCache is not accessible to TESRs and other client-side
logic - MinecraftForgeClient.getRegionRenderCache.
2016-01-24 09:59:38 +03:00
01919e4eed
Fix J6 compile error in IItemHandler PR.
2016-01-23 22:52:32 -08:00
e9a86f27fb
Merge pull request #2385 from rwtema/master
...
Add IItemHandler capability
2016-01-23 22:06:29 -08:00
a1e41f5464
Add IItemHandler capability
...
Add the actual patches that I forgot.
Add simple implementations of IStorage and the factory methods.
Add ItemStackHandler. A simple IItemHandler implementaton.
return nulls, not throw nulls.
Move the vanilla wrappers to a separate class for now.
Minor clean ups of VanillaWrapper code.
Inline static methods.
Add comments.
Minor cleanup of code.
Remove redundant size field and add a validate slot index method.
Minor formatting issues.
Break early If stacksize to insert is 0.
Remove setByte() methods.
Throw exception if IItemHandler can't be modifyed in NBT loading.
Replace event handler with patches
Add capability to mine cart inventory entities.
Change formatting and registration of capability.
Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them.
Reduce patch sizes
Lazy initialization of the item handler for vanilla tiles.
Minor formatting changes.
Create a single vanilla chest item handler that will merge with adjacent chests when detected. Added hooks to reset the cached adjacent value when a block update is detected and when a chunk loads.
Revert "Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them."
This reverts commit 306d4a37fd0e8c8a0754411c013b750dfe8e2c87.
Fix furnace derp
Replace double chest code with a simpler method.
Vanilla wrappers implement IItemHandlerModifiable (since they are modifiable)
Minor code cleanups
Add an onContentsChanged() and onLoad() callback methods.to the default implementation.
Add slot as a parameter in the callback method.
Change IItemHandlerModifiable.setStackInSlot() to void, and added a note about not being intended for cross-mod use.
Improve ItemStackHandler handling of errored NBT.
Make the stacks array protected.
Fix a lot of derps in SlotItemHandler.
Fix derp in ItemStackHandler
Clarify comments on IItemHandler
ItemStackHandler no longer caches the stack array in local variable.
Clean up the Chests code to make intentions clearer
Vanilla hoppers have their cooldown activated when an item is inserted. Made this behavior part of an item handler (rather than the insertion code)
Fix mistake in ItemStackHandler
More documentation of potential edge cases in getStackInSlot()
Make limit checking more resiliant.
2016-01-24 05:20:58 +00:00
82647f5b66
Restore OreDictionary.getOres(String, boolean) and doeOreNameExist(String) functions that went MIA in git merge issue.
...
Original Commit: cd3bbfb02c
2016-01-21 13:41:26 -08:00
c7dafeed5f
Merge pull request #2396 from Minecrell/patch-3
...
Strip console formatting codes for Vanilla log file
2016-01-21 13:02:34 -08:00
66340a7ec9
Strip console formatting codes for Vanilla log file
2016-01-21 20:00:41 +01:00
a3d4fe5d25
Fixed makeItemStack ignoring stackSize
...
Fixes #2376
2016-01-21 15:31:39 +01:00
17e8de8a3a
Fixed error detection login in ModelLoader, reduced the maximum number of printed stack traces to 5 per domain.
2016-01-20 01:20:26 +03:00
f3c2eb8e9c
Fix Deobfusication transformer throwing verification errores in Eclipse development environments.
2016-01-19 02:14:22 -08:00
968b7cae40
Correctly handle error caused by missing/malformed bucket model definition file.
2016-01-18 21:35:23 +03:00
3c5103acfb
Fix ItemStacks not getting the parent capability provider from items. Closes #2383
2016-01-17 13:37:57 -08:00
fae5ff67ed
Allow sleeping without bed
2016-01-17 00:43:29 +01:00
accf6cf218
Fixed missing model error reporting, made block and item variants sort before loading, to make the splash screen info more useful.
2016-01-17 01:57:06 +03:00
cc593d4b54
Fixed problem with LAN connections seeing the original ProxyPacket and consuming the first byte. Closes #2373
2016-01-16 16:34:02 -05:00
7b92a27908
Clone FML packet indexes if channel is not open. Fixes potential threading issue.
2016-01-14 13:35:19 -08:00
2857b710f8
Default bucket model is empty, allow bucket model without fluid.
...
This allows capsules, cans, bottles,... to use the same item model for their item variant. Also it's makes much more sense.
2016-01-14 22:13:31 +01:00
aee1bd6014
Add GuiScreenEvent.BackgroundDrawnEvent
2016-01-13 13:01:16 -08:00
9a737b0c90
Fix problem which meant runtime deobf to MCP names wasn't working. SRG named mods located in the mods dir of a dev
...
environment will now load normally.
2016-01-13 00:26:52 -05:00
17db34ae31
New Capability system allowing for more manageable world object features.
...
When combined with @Optional this should address all issues of soft dependancy on mods/apis.
This also addresses the issue of dynamic functionality in TileEntities/Entities.
Current capability providers: TileEntity, Entity, ItemStack
Also added INBTSerializeable, a generic interface for game objects that can be written to/from NBT tags.
Vanilla capabilities will be coming soon, mostly on request and review.
So start requesting capabiliteis on vanilla/Forge features.
2016-01-11 16:04:22 -08:00
2594196c15
Fixed GuiWrongMinecraft having wrong Log file name. Closes #2348
2016-01-10 20:31:55 -08:00
afc46fa59a
Made WrongMinecraftVersionException and ModSortingException a bit easier to read in log files. Closes : #2345
2016-01-10 11:07:12 -08:00
76c40896e4
Remove dead code in JarDiscoverer. Closes #2346
2016-01-10 11:06:37 -08:00
f42137907e
Implemented face culling for item models, improves performance slightly. Closes #2326
2016-01-09 19:05:18 +03:00
5c5d946ff5
Made block model loading bar more robust, and fixed the count.
2016-01-07 02:09:29 +03:00
95615cb4bf
Added progress bar for the ModelLoader.
2016-01-06 22:53:34 +03:00
68339f51cf
Derp.
2016-01-06 22:06:36 +03:00
949e77b46a
Model loader improvements: adding custom data/textures to models that don't need them doesn't cause a error now, since it's common to put those in the defaults section of the blockstate json; you can get IModel associated with the variant now - using ModelLoaderRegistry.getModel; MultiLayerModel should now respect transformations applied to it, and respect part transformations.
2016-01-06 22:00:43 +03:00
632d8e553d
STFU I know how to code. *shouts* get off my lawn!
2016-01-04 16:18:44 -05:00
035dd4c245
Make the parent dir tree for the dep extractor
2016-01-04 09:07:28 -05:00
4732acc1c4
Java6 + Eclipse + Gradle strike again.
2016-01-04 15:18:36 +03:00
b8dd4c54e1
Fixed implementation if IRetexturableModel in ItemLayerModel. Closes #2244 .
2016-01-04 14:21:31 +03:00
f562579054
Don't crash on exception during loading of item variants from blockstate jsons.
2016-01-04 14:08:52 +03:00
856a9c3cdd
Fixed perspective transformation handling for fluid models, changed inventory fluid model to use unrotated still texture.
2016-01-04 13:54:45 +03:00
826b1d20f8
Fixed invalid flow vector caching of still fluids.
2016-01-04 12:48:10 +03:00
686b32bfd0
Fixed random offset not working properly for flatly-lit models.
2016-01-04 12:04:30 +03:00
3c08c104cc
Explicitly close the file.
2016-01-03 10:06:25 -05:00
dc4dc55dcd
Add a simple ContainedDep mechanic- mods can contain other mods or libs, and can specify them using a manifest tag: "ContainedDeps".
...
This is a space separated (manifest standard) list of jar files that are to be extracted into the version specific directory.
There's also a special system property "fml.skipContainedDeps" that will allow for runtime skipping of extraction of contained deps (a comma separated list, based on the file name).
2016-01-02 17:28:35 -05:00
1a31ff9f06
Added new get/setRegistryName functions to Item and Block.
...
And helper functions in GameRegistry to allow for registering using those names automatically.
This is to simplify registration and get rid of the horrible hacks users are doing now with 'unlocalised names'.
2016-01-02 12:58:57 -08:00
fb54ea94c0
Move substitution activation after id loading. This should fix the problem of null for existing object.
2016-01-02 12:06:53 -05:00
d105c444ee
SidedProxy now has sensible default values - nested ClientProxy and ServerProxy classes.
2016-01-02 09:59:14 +03:00
104feb2973
Reverted Render registration changes due to them working.
2016-01-01 08:51:56 +03:00
a4123580b1
Nobody is left behind.
2016-01-01 02:17:10 +03:00
cf2bbd1353
Fixed RenderingRegistry not working. Closes #2312 .
2016-01-01 02:01:03 +03:00
6e90348dc5
Fix that the dummy registry entries don't allow clients connecting to servers. Also fix that it repeatedly nags about missing stuff in the world.
2015-12-31 17:59:11 -05:00
50f235c81b
Fix boss health bar rendering when debug overlay is enabled. Closes #2328
2015-12-31 14:48:54 -08:00
e0f0273c5e
Fix J6 compile issue with ModelFluid.
2015-12-31 14:40:32 -08:00
3665d7bf73
Allow for default 1.8.8 mods to be loaded. Should be SRG compatible.
2015-12-31 14:40:17 -08:00
ea2beba5ca
Restored transparency to the Forge logo.
2015-12-30 19:35:32 +03:00
6c40b15d04
Updated the forge logo to a higher-quality GIF file. Closes #2276 .
2015-12-30 19:10:33 +03:00
23a2316157
Fixed wrong import.
2015-12-30 16:14:27 +03:00
10658f682e
Fixed broken leaky caching of OBJ models.
2015-12-30 16:08:08 +03:00
33b1f8f30f
Caching of fluid models. Fixes #2145 .
2015-12-30 13:31:36 +03:00
db3e039b31
TESRs registering in preinit don't break pistons anymore. Fixes #2298 .
2015-12-30 11:37:32 +03:00
09e9a181ee
Fixed color disabling not working for forge pipeline. Closes #2286 .
2015-12-30 11:22:22 +03:00
56eba05237
1.8.9 update
2015-12-30 07:15:03 +03:00
509cc79112
Fix bucket replacement not loading the bucket model by itself if replacing buckets.
...
This happens when no other mod that uses the bucket model is present.
Also added a simple method for registering the bucket model, should give
modders an idea on how to use the general model.
2015-12-29 13:31:35 +01:00
1cd0bf9ee4
Fixed random block position offset not applying correctly.
2015-12-25 09:31:32 +03:00
097c0c6130
Added an ability to register custom item variants, not ending with "#inventory". Should allow grouping multiple item models into 1 blockstate json.
2015-12-24 06:06:38 +03:00
a54b939ea3
Try and make sure active substitutions are immediately available in the block to item map.
2015-12-23 16:41:53 -05:00
95825e5de0
Actually use the delegate for the itemblock
2015-12-23 15:55:45 -05:00
54e9a36b67
Capture ItemBlock remaps.
2015-12-23 15:07:16 -05:00
53227982e3
Try and fix registry NPE when substitution is active.
2015-12-23 14:11:17 -05:00
bcecf59a87
Blocks are no longer erased from the registry if the mod isn't present. This means that modded blocks can potentially retain their IDs
...
even if they are temporarily not present in the game. Currently TileEntity data associated with the block is erased.
2015-12-23 11:18:54 -05:00
5562c14c45
Fix up persistent substitution. Should close #2259
2015-12-23 10:37:11 -05:00
d8ca68b280
Fix the channel handler naming. It now uses the standard netty namer for it, by careful use of cunning reflection.
2015-12-22 18:12:35 -05:00
cb609dbab3
Fixed registry issues that prevented connecting to 1.8 Forge servers.
...
More precisely: Servers with missing registries default back to frozen version.
Throw descriptive error if we do not have any information.
2015-12-21 13:42:40 -08:00
c7790f7b35
Merge pull request #2282 from bonii-xx/dynbucket
...
Add a dynamic bucket model that displays the animated liquid contained
2015-12-22 00:26:25 +03:00
4f6784b733
Add a dynamic bucket model that displays the animated liquid contained
...
Has a config option (default off) that replaces the vanilla buckets with the forge bucket model
New original bucket textures from mr_hazard
2015-12-21 22:22:40 +01:00
56f35f4401
Fixed NPE caused by accessing undefined layer in MultiLayerModel.
2015-12-20 22:16:17 +03:00
b665026378
Fix client side commands adding parts of the color codes on autocomplete (prefix "7" and suffix "r").
2015-12-19 12:55:26 +01:00
1dcc9abab2
Fix dependency resolution for models with custom data/textures.
2015-12-17 04:41:54 +03:00
80ba13be89
LightUtil.pack and .unpack now work correctly with unpacked arrays of size <4.
2015-12-15 23:31:09 +03:00
d67c57827a
Delayed quad list resolution in MultiModel, fixes NPE in MultiLayerModel.
2015-12-15 23:03:09 +03:00
f0ae51bb34
Forge pipeline will now take original model lightmap into account, if present.
2015-12-15 22:27:01 +03:00
7c4d643de2
Fixed java6 errors in previous commit.
2015-12-15 22:27:01 +03:00
86c09722a0
IModel can now depend on a variant definition (ModelResourceLocation); added MultiLayerModel - simple model that'll render correctly in multiple layers + example of using it.
2015-12-15 21:49:19 +03:00
d6ee373e87
Preparations for the Animation system.
...
Changes to the Model API - IModelState now works with Optional. Handling of parts of the model is not optional, and coordinate space/result interpretation is up to the caller. IModel doesn't extend IModelPart by default anymore; MapModelState uses composition to achieve previous functionality, IModelPart implementations are disjoint now. Updated perspective handing to the new API, removed IPerspectiveState (MapModelState is now the same thing). Perspective transforms for the default fluid model.
2015-12-14 23:27:27 +03:00
bf779e6803
Merge pull request #2270 from AlgorithmX2/getHighlightTip
...
Add getHighlightTip allowing a item to override its displayed renderToolHightlight
2015-12-13 17:00:02 -05:00
94eadab9fd
A test for issue #1848 . Please try this with any mods you can @ 1.8.8, and see if you still get log spam of any kind (not just the
...
log message from the issue either).
2015-12-13 14:22:53 -05:00
8db720151d
Add getHighlightTip allowing a item to override its displayed renderToolHightlight.
2015-12-13 04:47:25 -06:00
0632f2aadf
Fix derpage when loading a 1.8 world, with persistent state being entirely ignored in that case.
2015-12-12 18:53:44 -05:00
c6d64cd94a
Merge pull request #2239 from bonii-xx/potionhiding
...
Add shouldRender() to Potions that allows to hide them completely in …
2015-12-12 00:18:18 -08:00
cef50616d8
Merge pull request #2228 from Minecrell/patch-2
...
Fix some issues with the console command completion
2015-12-11 15:42:06 -05:00
46840fb71a
Merge pull request #2233 from liachmodded/mcl-typo
...
Fix a typo in jar detection
2015-12-11 15:16:24 -05:00
dcda451a0a
Deprecate int IDs in FluidRegistry. Modders should only ever use the String name. Also add a 'friendly' exception when attempting to get an ID for a unregistered fluid. Closes #1374
2015-12-10 02:54:00 -08:00
2302963a9f
Add EMERALD and SILVERFISH to GenerateMinable event. Closes #1158
2015-12-10 02:16:58 -08:00
b9d1d92654
Fixed ModList GUI rendering incorrectly. Closes #2254
2015-12-10 01:01:51 -08:00
724405d6d8
Workaround for https://github.com/google/guava/issues/738
2015-12-09 14:56:01 +03:00
3254e2acc6
Fixed orientations of generated item faces. Fixes #2215 .
2015-12-08 12:26:02 +03:00
2324c2fd20
Add shouldRender() to Potions that allows to hide them completely in the inventory
2015-12-05 10:09:02 +01:00
bb3596b31e
Improve the console command completer
...
- Fix space after command getting removed when completing a
subcommand together with the command prefix
- Add support for completing without input (shows command list)
- Sort command completion results
- Fix console spamming command prefixes after closing the input stream
2015-12-04 16:50:07 +01:00
30bc2653c5
Add a flag to the modidremapping event. If the remapevent is because the registry is refreezing, it'll be true.
2015-12-03 17:21:04 -05:00
ee61baee73
Fix typo in `guava`
2015-12-01 22:01:21 -08:00
606b402c2d
Initialize sources list
...
Fixes crash NPE thrown by addFile()
2015-12-01 16:02:45 -07:00
7a960edb35
Fix language adapter loading.
...
The language adapter is now properly picked up after the mod is loaded
on the classpath, fixing the ClassNotFoundException occurring before.
Also fixed some minor formatting and made it throw a full
RuntimeException on failure.
Fix up some formatting
2015-12-01 14:43:14 -05:00
a703367553
Be noisy when API is in a coremod. It'll never work and modders should realize that fact.
2015-12-01 13:08:35 -05:00
413f380781
Merge branch 'fix/secman' of https://github.com/kashike/MinecraftForge into kashike-fix/secman
2015-12-01 08:47:26 -05:00
a2e06d968e
Merge branch 'Minecrell-jline' into 1.8.8
2015-11-30 14:16:18 -05:00
ff42107b92
A few fixes
2015-11-30 14:14:56 -05:00
321665efff
Merge branch 'jline' of https://github.com/Minecrell/MinecraftForge into Minecrell-jline
2015-11-30 13:14:49 -05:00
55e707cc07
Some tweaks - GameRegistry is modder facing API, so avoid having MC methods there. Fix a couple of registry bugs.
2015-11-29 23:12:34 -05:00
0af45cbf25
Merge branch 'PotionRegistry2' of https://github.com/bonii-xx/MinecraftForge into bonii-xx-PotionRegistry2
2015-11-29 22:43:23 -05:00
d58ad8db68
Fix problem with spam from registry on loading a second world. Empty the staging.
2015-11-29 22:41:11 -05:00
57d1a657a0
Add a PotionRegistry to handle dynamic distribution and remapping of Potion IDs
2015-11-29 22:02:55 +01:00
21173c3b65
Fix up blockstate rebuild. Closes #2221 . Also fix formatting. IDEA has differences. Solved now.
2015-11-28 16:31:54 -05:00
97ef6a5d1f
Giant registry fixup
2015-11-28 03:07:53 -05:00
5549b06f96
Compiler warnings pass, undeprecated SplashProgress related stuff.
2015-11-26 19:38:21 -08:00
e2818a2803
Removed IItemRenderer class, all functionality is possible with new rendering system.
2015-11-26 19:37:44 -08:00
eb26b3ca0f
Bump version for new Minecraft version.
2015-11-26 17:05:45 -08:00
7e5a2cb5ca
Propogate AbortException. Closes #2206 . Also fix tracing printstream when printStackTrace is called.
2015-11-25 16:28:06 -05:00
cb2d5992d2
Add .exc for StatList patch
...
More tweaking
2015-11-25 02:23:21 -05:00
85d7b69d19
More cleanups, some documentation, a bunch of deprecations.
2015-11-24 16:47:46 -05:00
c5a980f8a4
Cleaning up some derpy names
2015-11-24 16:17:08 -05:00
8c5038c301
Clean up some very long dead code. Bukkit hasn't existed in a very long time now. IASM never worked, and I'm not about to implement it.
2015-11-24 15:52:14 -05:00
f227f4ff72
Deprecate it as well, because hey, it's redundant now.
2015-11-24 15:39:18 -05:00
aa40a8edd7
ONE EVENT BUS TO RULE THEM ALL AND IN THE DARKNESS FIRE THEM!
2015-11-24 15:35:24 -05:00
44c4011575
Yeah, amount is NOT deprecated.
2015-11-24 15:30:22 -05:00
c713309769
OMG! Documentation? WUT? I haz lost my mind.
...
Also, Functional interface for IMC. Senders can send a classname implementing Guava's function, and receivers
will be able to get that function, and do, well, whatever, really. Probably best for those callback type
scenarios, connecting up APIs and stuffs.
2015-11-24 14:44:19 -05:00
b4dc15a9cb
Cleanup Fluid deprecations stuff.
2015-11-24 10:05:35 -05:00
68dfcccd57
Update mappings to 20151122.
2015-11-23 23:18:52 -05:00
84c3ef0f5c
Merge branch 'master' into 1.8.8
2015-11-23 22:39:49 -05:00
231ec7eaea
Merge remote-tracking branch 'origin/noci-1.8.8' into 1.8.8
2015-11-23 22:08:42 -05:00
9815d729b5
Fixed NPE is B3D loader caused by the missing vertex normal; updated the example chest model - it's now has 2 meshes; Updated ModelAnimationDebug - it now uses the new chest model, renders the base with the static world renderer, and only the lid with the TESR.
2015-11-23 10:12:01 +03:00
11d237f5f2
Fixed forge lighting working incorrectly outside 0x1000000 coordinates.
2015-11-23 06:54:18 +03:00
0d06ea6758
Removed face doubles from item models.
2015-11-23 06:54:18 +03:00
b5af11a89d
Fix holes in generated item models.
2015-11-23 06:54:18 +03:00
f6ab01843c
B3D loader: removed 2 redundand null checks, changed constructor args to final to fix (java6?) inner arg error.
2015-11-23 06:54:17 +03:00
f9024d2eb3
Implemented interpolation of TRSR transformations; B3D: added interpolation capabilities to B3DState, animated TESR example in ModelAnimationTest (pure TESR right now, no separation inside the example model between the static and dynamic parts right now).
2015-11-23 06:54:11 +03:00
2abca14a05
Small tweak to the OUT/ERR logger - should skip the Throwable stuffs now.
2015-11-22 15:31:06 -05:00
82d83feab1
Fixed forge lighting working incorrectly outside 0x1000000 coordinates.
2015-11-22 02:11:08 +03:00
e24c38bbb0
Add jline-based console with colors and tab-completion
2015-11-21 15:06:09 +01:00
c4742aadbc
Removed face doubles from item models.
2015-11-21 08:09:38 +03:00
62d0f01236
Fix holes in generated item models.
2015-11-21 07:45:56 +03:00
48b82567d2
BiomeManager: Fix off-by-one errors
2015-11-20 11:02:37 +11:00
07ccf667e4
B3D loader: removed 2 redundand null checks, changed constructor args to final to fix (java6?) inner arg error.
2015-11-19 23:40:44 +03:00
7689ea4f28
Use the FMLSecurityManager checkPermission(Permission) method for context-based permission checks. Fixes #2067
2015-11-18 15:39:00 -08:00
767d733948
Enable the normal ModList GUI in game. Use GL_SCISSOR to support the transparent in-game GUI.
2015-11-18 00:28:26 -08:00
13d7530e43
Implemented interpolation of TRSR transformations; B3D: added interpolation capabilities to B3DState, animated TESR example in ModelAnimationTest (pure TESR right now, no separation inside the example model between the static and dynamic parts right now).
2015-11-16 06:51:39 +03:00
06a2af3386
Merge branch 'master' into noci-1.8.8
2015-11-14 09:36:08 -05:00
41e971ecc9
Merge pull request #2117 from lumien231/master
...
Fixes Client Login Issue when logging into a non existent dimension
2015-11-14 04:20:34 -08:00
39e77bf468
Fix Client Login Issue when logging into a non existent dimension
2015-11-14 12:03:47 +01:00
f4c59a3a5d
Remove a suppression
2015-11-13 14:06:16 -05:00
deb26f5c80
ExtendedBlockState, Properties generic updates.
2015-11-13 19:29:44 +03:00
41c3846c51
Some generic and other warning cleanups
2015-11-13 10:13:47 -05:00
LexManos