payonel
d82a05fa28
comment version for new items
2017-12-14 07:59:26 -08:00
TheCodex6824
11f2c0a358
Add tier 1 wireless card ( #2657 )
...
* Added tier 1 wireless card as discussed in #2562
* Update lang/doc files
Remove unneeded component callback override
Add alias for old wlanCard name
* Moved wired and wireless max ports into one array
Added tested OreDict entry for wlanCard
* Bump version number for config updates
Fix typo in config comment
2017-12-14 07:44:23 -08:00
Xyxen
f485c7a898
Add creative component bus ( #2670 )
...
Supports 1024 components by default, and fits into a tier 3 slot.
2017-12-14 06:13:35 -08:00
Vexatos
40eb91d6b8
Merge branch 'master-MC1.11' into master-MC1.12
2017-12-11 13:24:12 +01:00
Vexatos
24a3056406
Merge branch 'master-MC1.10' into master-MC1.11
2017-12-11 13:22:53 +01:00
Vexatos
1633375355
Merge branch 'master-MC1.7.10' into master-MC1.10
2017-12-11 13:16:29 +01:00
Vexatos
ed6fe13ba4
Added curseforge plugin and change log.
...
Hopefully it works.
2017-12-11 13:07:12 +01:00
Vexatos
4c8799f38a
Added ComputerCraft support back to 1.12.
2017-12-10 16:40:25 +01:00
Vexatos
c6cdd99d0e
Merge branch 'master-MC1.11' into master-MC1.12
2017-12-10 13:21:58 +01:00
Vexatos
88aec7ee9d
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.properties
2017-12-10 13:21:07 +01:00
Vexatos
67ddab828a
Merge branch 'master-MC1.7.10' into master-MC1.10
2017-12-10 13:20:19 +01:00
Vexatos
b2cde198c1
Version bump.
2017-12-10 13:19:22 +01:00
payonel
97ad5ebdaf
1.12 build fix, Vec3d x,y,z and not xCoord,etc
2017-12-10 04:06:57 -08:00
payonel
90868bcb6b
Merge branch master-MC1.11 into master-MC1.12
2017-12-10 03:53:23 -08:00
payonel
c0eefc152e
Merge branch master-MC1.10 into master-MC1.11
2017-12-10 03:53:14 -08:00
payonel
1ed434d1bf
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/MotionSensor.scala
2017-12-10 03:53:10 -08:00
payonel
7933f5d7b4
fix motion sensor line of site
...
a new solution to use a normalized path vector and move the origin directly towards the player by .75m
closes #2615
2017-12-10 03:37:38 -08:00
payonel
69a81c3732
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
2017-12-09 22:08:38 -08:00
payonel
04eae30965
Merge branch master-MC1.10 into master-MC1.11
2017-12-09 21:57:53 -08:00
payonel
7b1867a888
tablet card support fixed
2017-12-09 21:55:54 -08:00
payonel
c23cb987f4
Merge branch master-MC1.11 into master-MC1.12
2017-12-06 07:48:10 -08:00
payonel
ef97a06305
Merge branch master-MC1.10 into master-MC1.11
...
#removed src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala from merge
#673facee9077454b8401b1bb018f626e02bf3802
2017-12-06 07:48:07 -08:00
payonel
0e42b03862
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
2017-12-06 07:44:08 -08:00
Joseph C. Sible
673facee90
Remove @Optional annotations that specify our lowercase mod ID ( #2661 )
...
Fixes #2649 . Explanation:
* Other mods can integrate with us by implementing the SimpleComponent
interface. They annotate its methods with @Optional to avoid a hard
dependency on us.
* Our mod ID changed from "OpenComputers" in 1.10 to "opencomputers" in 1.11.
* Some mods (like RFTools) can't refer to our mod by the right-case mod ID,
because the same .jar works on both 1.10 and 1.11.
* In most cases, using the wrong-case mod ID would just mean that integration
wouldn't work, but for us, it causes a crash.
* The crash is because we use ASM to inject some extra methods and make the
class implement a different interface. This means that if the @Optional mod
ID is wrong, our new interface will still be there but some of the original
methods won't, which leads to AbstractMethodErrors like McJty/RFTools#1466 .
* Forge looks for the @Optional annotations before our coremod can do
anything, so we can't just remove them from the class. Instead, we need to
remove them from Forge's internal list.
2017-12-06 06:42:10 -08:00
Amanda Cameron
63a89b3688
Implement issue #2654 ( #2659 )
...
* Implement #2654
* Make the screen-turn-on-at-boot actually work.
2017-12-06 06:41:30 -08:00
payonel
8e1faa831a
Revert change of maxComplexity for drone tier 2
...
we are discussing another solution to handle drone needs
2017-12-04 08:33:31 -08:00
payonel
ecd9926474
Allow drones to have nav+chunk+inv upgrades
...
I think it quite a reasonable drone design to allow a tier 2 drone to have
1. navigation upgrade (waypoints)
2. chunk loader (for traveling safely)
3. inventory upgrade (to cary and drop items)
closes #2043
2017-12-04 00:54:24 -08:00
TheCodex6824
40ec52121a
Drones now properly update chunkloaders
2017-12-03 09:00:40 -08:00
payonel
818f8b9058
Merge branch master-MC1.11 into master-MC1.12
2017-12-02 23:47:50 -08:00
payonel
f074f17e2a
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 23:47:48 -08:00
payonel
2279b734a8
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 23:47:37 -08:00
payonel
3ddd58374c
toString device info
2017-12-02 23:47:32 -08:00
payonel
9230bd0de9
Merge branch master-MC1.11 into master-MC1.12
2017-12-02 23:14:13 -08:00
payonel
1cb8d4f0cc
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 23:14:10 -08:00
payonel
e18123049b
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 23:13:22 -08:00
payonel
cad5026a5f
adding max packet parts to device info width for linked cards and network cards
...
closes #2294
2017-12-02 23:12:34 -08:00
payonel
29d2427380
Merge branch master-MC1.11 into master-MC1.12
2017-12-02 20:51:22 -08:00
payonel
c484de0b2f
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 20:51:19 -08:00
payonel
dbb3a2d9ed
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 20:50:55 -08:00
payonel
34820ad487
use custom slot for databases
...
closes #2546
2017-12-02 20:50:24 -08:00
Skye
62e38f40df
Readd the printing of a CTCP if it wasn't handled.
...
No I haven't tested this, what are you talking about?
2017-11-30 23:17:53 -08:00
LeshaInc
7f71953540
tree: fix tlwy error
2017-11-30 10:16:02 -08:00
payonel
1f3353a638
Merge branch master-MC1.11 into master-MC1.12
2017-11-28 22:48:08 -08:00
payonel
ef2a7488ca
Merge branch master-MC1.10 into master-MC1.11
2017-11-28 22:47:46 -08:00
payonel
893f76c8ff
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-28 22:47:34 -08:00
payonel
6cad5bb726
protect lua shell from serialization oom failure
2017-11-28 22:44:42 -08:00
payonel
c86b8b81d3
Merge branch master-MC1.11 into master-MC1.12
2017-11-27 13:56:59 -08:00
payonel
4f7d836536
Merge branch master-MC1.10 into master-MC1.11
2017-11-27 13:56:43 -08:00
payonel
4a9b24c9b7
merge oops
2017-11-27 13:56:36 -08:00
payonel
a6231971ef
Merge branch master-MC1.11 into master-MC1.12
2017-11-27 13:22:43 -08:00
