tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2529 commits 7 branches 98 tags 24 MiB
Commit graph

2529 commits

This branch
This branch
All branches
Author SHA1 Message Date
shartte
785e40ce3e Implemented quartz fixture model (#34) 
* Implemented the actual quartz fixture model.

* Added a custom texture for the metal bits of the quartz fixture.
 2016-08-16 15:38:24 +02:00
elix-x
63f426336b Fixes and cleanup 
- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.
 2016-08-15 18:19:33 +02:00
shartte
24ddc0e574 Controller Model (#33) 
* Implemented the controller models (using the UVL model loader to make the lights be fullbright at night).
 2016-08-15 10:28:45 +02:00
shartte
a422de6adb Fixes charger model and adds an appropriate item model. (#29) 2016-08-14 13:28:45 +02:00
shartte
7f923d7f25 Added a powered state for the crystal growth accelerator and added corresponding models. (#39) 2016-08-14 13:28:03 +02:00
shartte
5a7d099413 Added active state for vibration chamber and corresponding models. (#40) 2016-08-14 13:27:36 +02:00
shartte
53fd4de0cc Added stair blocks. (#47) 2016-08-14 13:26:53 +02:00
Thomas Saunders
8882c16cbf Move AXIS_ORIENTATION into QuartzPillarBlock 2016-08-14 10:17:50 +01:00
Thomas Saunders
f2cceda471 Move AEBaseBlock.AXIS_ORIENTATION to QuartzPillarBlock 
Move AEBaseBlock.AXIS_ORIENTATION into QuartzPillarBlock since it's used only there
 2016-08-13 18:10:23 +01:00
shartte
92b931434e More item models (#30) 
* Fixed tiny TNT item model.
* Flipped the inscriber north/south and implemented item model.
* Added several item models.
 2016-08-11 13:48:36 +02:00
shartte
8ddff3f459 Fixed blocks state <-> meta conversion (#31) 
-Added missing state <-> meta conversion methods to blocks. Fixes #23.
 2016-08-11 11:40:34 +02:00
elix-x
2208083b03 IHasSpecialItemModel 
IHasSpecialItemModel or IForgetToCommitStuff - #9?
 2016-08-10 14:42:52 +02:00
elix-x
3d1d2a3468 Fixed stairs & chests rendering 
-Fixed chests rendering in inventory (kinda).
-Fixed stairs rendering.
From now on, all blocks with multiple states MUST have item model.
Example stair provided (though with incorrect textures).
Relates to #9.
 2016-08-10 12:10:48 +02:00
elix-x
746bca8c40 Updated forge 
Updated forge.
It had some important fixes & additions.
 2016-08-10 12:07:14 +02:00
elix-x
6aeec56dc0 Removed duplicated crafting things 
Removed duplicated crafting things. For some odd reasons they were using
different blocks and meta at the same time. Probably somebody forgot to
do something while porting 1.7.10 -> 1.8 ;) .
Kinda relates to #9.
 2016-07-25 14:53:14 +02:00
elix-x
d68a7d316c What was forgotten in dc7ddfe 
What was forgotten in
dc7ddfe107.
Closes #24.
 2016-07-23 21:06:17 +02:00
elix-x
dc7ddfe107 Merged stairs feature handler with block's one 
Merged stairs feature handler with block's one.
Relates to #9.
 2016-07-20 15:49:03 +02:00
elix-x
8c5d85d52a Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering 
Merge remote-tracking branch 'origin/1.10-rv3-rendering' into
1.10-rv3-rendering
 2016-07-12 20:08:36 +02:00
elix-x
7a653675de Implemented modular TESR 
-Implemented modular TERS.
-Added ItemRenderable, charger example attached.
 2016-07-12 20:03:54 +02:00
dpeter99
4eccb1e770 New Models 
- Wireless Point
- Tiny TNT
 2016-07-11 21:38:40 +02:00
elix-x
524dc52dd6 Moved F2R, added TESRs, fixed culling 
-Externalized FacingToRotation.
-BlockLightDetector now uses tile based rotations.
-Added TESR methods and TESRs for chests. Can't get it to work in
inventory.
-Fixed rotation bugs involving culling and lighting. Now rotating culled
faces and normals too. Closes #21.
Relates to #9, #10 and #20.
 2016-07-11 15:38:54 +02:00
elix-x
d64a63992c Updated forge 
Updated forge. Because forge bugs were bothering me.
 2016-07-11 15:31:37 +02:00
elix-x
0809ac5625 Implemented automatic rotation 
Implemented automatic rotation for all tile blocks. You can still use
facing properties in model files, if you want to.

Also, some added some fixes and improvements.
 2016-07-05 19:43:51 +02:00
dpeter99
63fb23d1b6 Updated Item models 2016-07-02 17:24:27 +02:00
dpeter99
2e577edc3d Model Update 1 
- Removed textures
- Readded needed ones
- Added models, blockstates
- ChargedQuartzOreBlock
- ChiseledQuartzBlock
- FluixBlock
- QuartzBlock
- QuartzGlassBlock
- QuartzOreBlock
- QuartzPillarBlock
- SkyStoneBlock.BLOCK
- SkyStoneBlock.BRICK
- SkyStoneBlock.SMALL_BRICK
- SkyStoneBlock.STONE
- tile.BlockCellWorkBench
- tile.BlockCharger
- tile.BlockCondenser
- tile.BlockCreativeEnergyCell
- tile.BlockDenseEnergyCell
- tile.BlockDrive
- tile.BlockEnergyAcceptor
- tile.BlockEnergyCell
- tile.BlockGrinder
- tile.BlockInscriber
- tile.BlockIOPort
- tile.BlockSecurity
- tile.BlockSpatialIOPort
 2016-07-02 17:21:51 +02:00
elix-x
9f96b86938 Enabled block states ignoring properties 
Enabled block states ignoring. File with same name as block state, but
with .ignore.json extension. Although it's json extension, it is NOT IN
JSON FORMAT!!! Each line is name of property to ignore. Refers to #10.
 2016-07-01 20:19:10 +02:00
elix-x
e24d166f6a Passing rotations to models 
Implemented passing of rotations to models. Removed unused unlisted
properties. Included dummy grinder model. Found bugs that have to be
fixed.
Referencing #10.
 2016-06-30 15:51:42 +02:00
elix-x
0be0635a8f Fixed item models. 
Fixed all item models. Changed parent to "item/generated" and removed
display rotations as now they're done automatically.
Marks off ~all items in #9.
 2016-06-30 14:17:22 +02:00
elix-x
a2cad01c01 Moved UVLModelLoader to appeng 
Moved UVLModelLoader to appeng. It's working and does not belong to test
anymore. Also updated obf reflection names.
 2016-06-30 12:52:10 +02:00
elix-x
d98f1e8dc3 Updated minecraft to 1.10.2 
Updated minecraft to 1.10.2.
 2016-06-30 12:39:39 +02:00
elix-x
f1aab0f8ef Implemented models loading 
Implemented models loading.
Closes #8.
 2016-06-29 18:56:33 +02:00
elix-x
571db6b48b Fixed blocks & items registration 
Fixed blocks & items registration to use new methods.
 2016-06-29 16:00:04 +02:00
John Hannan
4c4bdff55c Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added 
Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added.
Closes #6.
 2016-06-29 15:30:08 +02:00
elix-x
03aa59521c Removed old rendering system 
Removed old rendering system. Some parts may be left over, but they
won't affect testing.
1.10-R todo tag marks things to do with rendering.
 2016-06-29 12:22:18 +02:00
elix-x
92753a432a Update forge to semi-stable version 
Update forge to semi-stable version.
 2016-06-28 20:39:39 +02:00
elix-x
84cfd4c9fc Created and tested UVLLoader 
Created and tested UVLLoader. Yes, it may not conform to code standarts,
but this will be fixed later.
 2016-06-28 15:24:38 +02:00
elix-x
b7b5d2590c Code updated to 1.10 
Code updated to 1.10. NOT 1.9.4 COMPATIBLE!!!
 2016-06-25 11:00:17 +02:00
elix-x
44c86849b8 Updated workspace to 1.10 
Updated workspace to 1.10. Had to update forge gradle, because of not
updated MCP.
 2016-06-25 10:51:58 +02:00
elix-x
8acee98b8f Third update pass (3/?) 
Last (?) update pass. AE2 can be launched and used (?) in game.

Rendering system changed again and again - rendering is NOT working, to
be rewritten and CAN be done a lot simpler.
 2016-06-21 16:36:15 +02:00
elix-x
05aa6972c4 Second update pass (2/3) - 82 -> 0 errors 
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
 2016-06-21 11:03:10 +02:00
elix-x
5498eb6d7c First update pass (1/3) - ~1400 -> 82 errors 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
 2016-06-19 14:43:27 +02:00
elix-x
d9725a7d9b Updated API to 1.9.4 
Updated API to 1.9.4. All compile errors are fixed in APENG-API.
 2016-06-17 12:54:13 +02:00
elix-x
2918a1110b Updated workspace to 1.9.4 
Updated workspace to 1.9.4.
 2016-06-17 12:46:55 +02:00
thatsIch
a4cf557b65 Update to Forge 11.15.1.1855 2016-04-27 13:08:13 +02:00
Kasama
a122f939e0 Updated pt_BR.lang to match latest en_US 2016-04-27 13:07:06 +02:00
thatsIch
57771d3a81 Update to Forge 11.15.1.1747 to get access to capabilities 2016-02-16 22:43:19 +01:00
thatsIch
69e41e283d Remove old sourceJar artifact since its apparently provided 2016-02-16 22:25:31 +01:00
thatsIch
98bded8653 Use new 1.8 minecraft.coreMod attribute to let it automatically add to the manifest and runconfiguration 2016-02-16 22:24:49 +01:00
thatsIch
0c61a316ed Can generate javadocs again using gradle 2016-02-16 22:08:55 +01:00
thatsIch
f3374ba509 Exclude javadocs to remove compile issues of minecraft related classes 2016-02-16 21:22:55 +01:00