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

2505 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
thatsIch
ca21da1421 Improve javadoc of the model generator 2016-02-16 21:09:43 +01:00
thatsIch
aff3941729 Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface 2016-02-16 21:06:59 +01:00
thatsIch
8383715892 Re-add JUnit 2016-02-16 21:00:12 +01:00
thatsIch
78a3cf90ee Update Gradle from 2.7 to 2.11 2016-02-16 20:08:11 +01:00
thatsIch
372d2a8386 Reduce script loading time by excluding non important parts regarding external dependencies or mods 2016-02-16 19:54:28 +01:00
thatsIch
169624f45e Prioritize JCenter over Maven Central for dependency resolution 2016-02-16 19:51:33 +01:00
yueh
89a0f12dc4 Updated to minecraft 1.8.9 2016-01-10 01:58:42 +01:00
JJN
fdfc373181 fixed #2090 
fixed #2090
 2016-01-09 23:24:03 +01:00
Adaptivity
fdd16d8876 Ore Dictionary support for recipes 
Added missing changes to oredict.recipe
 2016-01-09 23:23:50 +01:00
Florian Nücke
cff5e7b388 Reworked computer P2P tunnel to use events, and cleaned up reconnection, fixes #2087. 
Just `onTunnelNetworkChange` with tickable is apparently less exhaustive, and less stable. This now avoids issues with network splits and reconnects not being handled in some cases. Also simplified reconnection; there was some duplicate logic in there, with a missing validity check which potentially led to invalid connections.
 2016-01-09 23:23:02 +01:00
yueh
62aa13751b API version will be replaced during build with the correct rv. 2016-01-09 23:19:10 +01:00
yueh
927ecc015b Fixes #2043: Storage buses updates should happen in the correct order. 
This is loosely based on #2032 and should prevent any duplicated event,
but still does a refresh the whole cache due to potentially issues with
some inventories.

It also ensures that storage buses will not announce a CellArrayUpdate
before they are fully initialized, thus no longer causing them to return
null during an update.

Fixes #2403
 2016-01-09 23:17:25 +01:00
yueh
977c9ea70f Merge cleanup 2016-01-01 02:59:20 +01:00
yueh
b62ff9898f Interfaces now slow down with failed crafting attempts. 
Cleanup of unneeded tracking of failed attempts of MultiCraftingTracker.
Followup of #1905
 2016-01-01 02:56:07 +01:00
yueh
02ac8cf220 Refactored the logging 
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.
 2016-01-01 02:55:36 +01:00
Wilhelm Schuster
242c05266f Update and extend German translation 
Add translated achievements.
 2016-01-01 02:45:21 +01:00
yueh
f84b9a7e1d All parameters on one line (for now) 
Easier picking of 1.7 changes
 2016-01-01 02:02:05 +01:00
yueh
e08ab38c52 Added missing annotations 2016-01-01 01:51:10 +01:00
yueh
98234f9935 Use qualified access 2016-01-01 01:50:28 +01:00
yueh
7134e851e4 Use final 2016-01-01 01:49:45 +01:00
yueh
e5d6a40511 Always use {} 2016-01-01 01:49:05 +01:00
yueh
ab689f2a48 Code format 2016-01-01 01:48:15 +01:00
yueh
68c3ea5ae9 Organize imports 2016-01-01 01:47:22 +01:00
yueh
72923cadb4 Updated buildscript 2016-01-01 01:46:06 +01:00